Merge proposals dependent on lp://staging/~abreu-alexandre/unity-firefox-extension/release-2.4.7

1. release-2.4.7
2. Dependent merge proposals