The code is now identical to the one in 2.5 and it still suffers from the problem described in MXS-3885. This will be fixed in a separate commit. This commit changes the persisted filename but since it was ignored, it won't affect old installations.
e087a327fb