Bug 496465: Prep for 4.7 (Oxygen) builds
14 files changed