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