Copied over changes from 1.1-286.trunk-merge in anticpation of testing patches applied in PLUTO-442. 

git-svn-id: https://svn.apache.org/repos/asf/portals/pluto/branches/1.1-286-COMPATIBILITY@598004 13f79535-47bb-0310-9956-ffa450edef68
44 files changed