Updated default test config
Merge branch 'BS-10196_Bundles_upgrade' into 'BS-10213_bundle_Jboss7'