Reopen to 4.1

And make BUILD_DISPLAY_ID follow BUILD_ID

Change-Id: I35dbd99241f3c756d707fa44642113ede939724a
Fix for required nickname on app start.  Now forces the user to set an alias before connecting.

Change-Id: Ie9790ec1a14ab32dfa9403a9aefcfb96a6e80f61
Merge "Fix for required nickname on app start.  Now forces the user to set an alias before connecting." into jb4.2
For merge
Merge remote-tracking branch 'slim/jb4.2' into mirage