Revert "Merge branch 'BS-10213_bundle_Jboss7' into 'master'"

This reverts commit ae27885e5d11fcd9478e9facbe9afc3806371d58, reversing
changes made to 9fe81be698d952bff27d173d4e267cfbb25f6df1.
Merge branch 'master' into 'MasterBugFixing'