Merge remote-tracking branch 'origin/master' into feature/upgrade-gatein-3.7.x