Feature/upgrade gatein 3.7.x