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