Merge proposals dependent on lp://staging/~abreu-alexandre/webbrowser-app/webapp-properties-ua-override-fix-rtm-14.09

1. webapp-properties-ua-override-fix-rtm-14.09
2. Dependent merge proposals