Jbide 13537 maint

a collection of commits necessary to get eap6.1 / as7.2 / jpp 6.0 working in maintenance