revert to initialising identity bootstrap in the app.js
resolve conflicts
Merge pull request #6558 from guardian/revert-avatar-fix

revert to initialising identity bootstrap in the app.js