merging trunk to transient-state branch -r 690852:708342

git-svn-id: https://svn.apache.org/repos/asf/continuum/branches/continuum-transient-state@708765 13f79535-47bb-0310-9956-ffa450edef68
186 files changed