Merge 1.4.2 to develop

Testing status: most tests should pass, but occasionally I'm seeing the vnode proxy overload and stat cache tests fail, unfortunately.