[KARAF-3041] Provide additional helper methods in OsgiCommandSupport
[KARAF-3033] The system bundle should export and boot delegate javax.xml.crypto packages
KARAF-3044 - Can't shutdown karaf via wrapper on AIX
KARAF-3045 - simplify console branding

Conflicts:
	manual/src/main/webapp/developers-guide/branding-console.conf
KARAF-3056: Upgrade to JLine 2.12
Small cleanup
[KARAF-3061] Problems with jaas:realms / jaas:manage commands when using multiple realms of the same name
[KARAF-2789] Upgrade to SSHD 0.10.1

Conflicts:
	pom.xml
	shell/ssh/src/main/java/org/apache/karaf/shell/ssh/SshAction.java
	shell/ssh/src/main/java/org/apache/karaf/shell/ssh/UserAuthFactoriesFactory.java
[KARAF-2789] Upgrade to SSHD 0.11.0

Conflicts:
	pom.xml
[KARAF-3095]add a flag to bin/client so that it can read private key from a specified location
Remove servlet-api dependency (replaced by the geronimo spec one)
Merge branch 'karaf-3.0.x' of https://git-wip-us.apache.org/repos/asf/karaf into karaf-3.0.x
Update the BUILDING notes
Extend Maven version in enforcer plugin
Extend Java version in enforcer plugin
Extend Maven version in enforcer plugin
[KARAF-3058]add backing engine serivce for org.apache.karaf.jaas.modules.publickey.PublickeyLoginModule
(cherry picked from commit 930593de4397903b23c5703b12d43624ce8f39fa)
[KARAF-2816] Upgrade to Spring 3.2.8.RELEASE_1

Conflicts:
	assemblies/features/spring/src/main/feature/feature.xml
	pom.xml
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