Merge remote-tracking branch 'apache/2.x' into feature/2.x/change-is-webapp