Fix syntax error in the production configuration caused by #202. rs=bustage-fix
Merge branch 'master' into persona-login-functional-tests

Conflicts:
	config/production.json