Add patches for 2014-07-08 batch.
Add two missed patches for 8.4-RELEASE.
Rename files to reflect reality.