LRDOCS-1468 Add JBoss change related to OSGi to User Guide
Merge branch 'master' into osgi-jboss-config

Conflicts:
	userGuide/en/chapters/16-installation-and-setup.markdown
Merge pull request #1090 from codyhoag/osgi-jboss-config

Added JBoss change to User Guide