Bug 860996 Changing Persona references to themes
Merge branch 'bug-860996-remove-getpersonas' of github.com:retornam/bedrock into bug-867810-update-features-page

Conflicts:
	apps/firefox/templates/firefox/features.html