[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