update branch of what's currently in trunk; will need to bring back the changes for flat multi-module support


git-svn-id: https://svn.apache.org/repos/asf/continuum/branches/continuum-flat-multi-module@941625 13f79535-47bb-0310-9956-ffa450edef68
633 files changed