INTEG-113: upgrade gatein 3.5.0.Final, merge to master branch