Merge remote-tracking branch 'upstream/master' into buy_app

Conflicts:
	gaiatest/apps/persona/regions/login.py
[v1.0.1]Updated Persona locators for Marketplade dev login
Merge remote-tracking branch 'upstream/master' into buy_app