BS-1379, make transient data persistent to disk
fix test that depend on current version of engine hard coded
Revert "BS-1379, make transient data persistent to disk"

This reverts commit b458b7a75a6b677fcb8b757b5797381e9c3d054c.
Merge branch '6.1.x'
Merge branch 'CoreProduct'