#5612
#5612
#5612
#5612
#5612
#5612
#5612
Commented debug parameters #5612
#5868
#5868
#5868
Merge remote-tracking branch 'remotes/origin/master' into issue-5612-set-up-in-websphere
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
Reverting changes
Merging remote-tracking branch 'remotes/origin/issue-5868-Jarjar-support-for-repackaging-of-manifest-files' into issue-5612-set-up-in-websphere
#5612
#5612
#5612
Merge remote-tracking branch 'remotes/origin/master' into issue-5612-set-up-in-websphere
Merge pull request #5935 from dotCMS/issue-5612-set-up-in-websphere

Issue 5612 set up in websphere