1171509 - FastForwardXmlFileContext was sometimes finding the wrong file and was not cleaning up after itself.

Add 2.5.0 -> 2.5.1 upgrade instructions
Merge branch '2.5-testing' into 2.6-dev
Merge branch '2.6-dev'