TestFlexDynamicRoles clean up a couple of unused imports
BUG-13647 double cluster flex & AM Restart lose information if first flex not persisted
Merge branch 'feature/BUG-13647' into develop