Bug 863417 - toolkit.identity.uri pref; resolved conflicts from v1-train

Bug 863417 - Can now set toolkit.identity.uri as pref; r=fabrice, a=tef+
(cherry picked from commit 9dbb2d9ee919ea75d33be495ff710b7c3a3b24d9)

Bug 863417 - pref for identity ui, fix line too long; a=tef+
(cherry picked from commit f48d569231583b91118f1c9c848796259e35aa7b)

Conflicts:
	apps/system/js/identity.js

(Bugzilla: https://bugzilla.mozilla.org/show_bug.cgi?id=863417#c47)