Apply SA-CORE-2014-005 to ancient D7 platforms if any still exists (it shouldn't, btw)
Use local copy of the patch.
Merge branch 'refs/heads/master' into cluster