[KARAF-3061] Problems with jaas:realms / jaas:manage commands when using multiple realms of the same name
Cleanup servlet-api dependency (use geronimo spec instead)
[KARAF-3095]add a flag to bin/client so that it can read private key from a specified location
(cherry picked from commit ddae1e4c44bf18f2e5925f6c81addec96789c56a)
Update the BUILDING notes
Extend Maven version in enforcer plugin
[KARAF-3058]add backing engine serivce for org.apache.karaf.jaas.modules.publickey.PublickeyLoginModule
KARAF-3068 - Update to Spring 3.2.9.RELEASE_1
[KARAF-3075]AdminService should avoid writing file in case just read instance status
(cherry picked from commit 32f47f4c22c2a520e9ea8cd97b70c1a776c5da6c)

Conflicts:
	main/src/main/java/org/apache/karaf/main/Main.java
(cherry picked from commit 4359a8fd56016981f81d0c4d696c540892d59766)
[KARAF-3075]AdminService should avoid writing file in case just read instance status
[KARAF-3072] Sync instance resources file with the root instance
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/karaf
[KARAF-3000]Whitespace in feature file bundle element value causes NumberFormatException
(cherry picked from commit 8d6f4dbebfe65fa0e459aa9665e5982104f7fecd)

Conflicts:
	features/obr/src/main/java/org/apache/karaf/features/obr/internal/BundleInfoImpl.java
KARAF-3074 Provide mbeans for statistics of hibernate session factories
KARAF-3074 Fixes in readme
Fix region artifactId in the excludedArtifact of the framework feature assembly
[KARAF-3072] Copy the bundle_scope ACL cfg from the root instance to the instances
[KARAF-3101] Upgrade to Spring 4.0.5.RELEASE
[KARAF-3046] Upgrade to gogo runtime 0.12.1
[KARAF-3107] Upgrade to maven-bundle-plugin 2.5.0
[KARAF-3106] Upgrade to blueprint core 1.4.1