#5868
#5868
#5868
Merge remote-tracking branch 'remotes/origin/issue-5868-Jarjar-support-for-repackaging-of-manifest-files' into issue-5612-set-up-in-websphere

Conflicts:
	dotCMS/html/portlet/ext/osgi/bundles.jsp
	dotCMS/html/portlet/ext/osgi/main.jsp