Merge r18462, r18482 from trunk to the 1.3.x-r18462 branch,
adjusting whitespace and removing a spurious whitespace change from
fs-loader.h, which wasn't otherwise modified.


git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.3.x-r18462@858869 13f79535-47bb-0310-9956-ffa450edef68
2 files changed