[BISERVER-11758] - adding users to roles was using incorrect util for generating the tenant id, causing the cache to keep the old user credentials.  Also, removing users from roles were not getting purged from the cache.  cherry-picked from ce700ed.
Merge pull request #1644 from kurtwalker/BISERVER-11758-51

Biserver 11758 51
Merge pull request #1645 from mdamour1976/5.1

[MOBILE-484] Pentaho Mobile is now presenting the user with BasicAuth rather than the mobile login page
[BISERVER-11761] Added JavaScript string encoding for SESSION_NAME and HOME_FOLDER in webcontext
Merge pull request #1647 from pminutillo/BISERVER-11761

Biserver 11761
[BISERVER-11770] Shutting-down existing scheduler properly so it's not orphaned in the JVM preventing JVM shutdown.
Merge pull request #1649 from pentaho-nbaker/5.1

[BISERVER-11770] Shutting-down existing scheduler properly so it's not o...
[PDI-12451] Remove interbase driver dep
Merge pull request #1650 from lmgrill/5.1

[PDI-12451] Remove interbase driver dep
[PPP-3283] DynamicallyPooledDatasourceSystemListener is creating bad DataSource objects for JNDI connections
[BISERVER-11783] Error starting up the biserver (the second time) due to DynamicallyPooledDatasourceSystemListener
Merge pull request #1654 from pentaho-nbaker/5.1

[PPP-3283] DynamicallyPooledDatasourceSystemListener is creating bad Dat...
Merge pull request #1656 from pentaho-nbaker/shared_xml

Shared xml
[BISERVER-11783] Handling DBDatasourceServiceException Exception
[BISERVER-11707] account for double encoding of / and \
Merge pull request #1658 from scottyaslan/devBranch5.1

Dev branch5.1
[PPP-3285] Remove upgrade guide pdf.
[PPP-3285] pdi upgrade file too.
[BISERVER-11787] - Marking a file as a favorite which has special characters completely breaks the Browse perspective
Merge pull request #1660 from jeffreythomas/5.1-dev

[BISERVER-11787] - Marking a file as a favorite which has special charac...