Merge pull request #9681 from jmcanterafonseca/automatic_logout

Bug 861290 Unable to sign off from the e-mail account, after deleting pr...(cherry picked from commit acb7c244193ca83dae0d6815d1c683129d2002da)

Conflicts:
	apps/communications/contacts/oauth2/js/parameters.js