PSST-86 Merge remote-tracking branch 'origin/jboss5' into PSST-86_Jboss_7

Conflicts:
	cookbooks/app_jboss/attributes/default.rb
PSST-86 Merge branch 'PSST-86_Jboss_7' of github.com:rs-services/cookbooks_internal into PSST-86_Jboss_7