Merge staging fixes back to QA

In a slightly weird way which reconciles my own diverged local QA with QA and seems to list an unexpected commit about save button. Which is already fixed right?
The only real fix I can see in here fix is #1534. Plus the getting the EF migrations fixed up for diverged branches.