* [5eca029, 3a80a92, eae4296, e6023f8] refresh patches against
new upstream
* [2130827] more forwardporting of deprecated persistence options
* [5eca029, 3a80a92, eae4296, e6023f8] refresh patches against
new upstream
* [2130827] more forwardporting of deprecated persistence options