Issue #2388445: test case for 5.x-6.x upgrade so we dont break anything!