Merge proposals dependent on lp://staging/~jamesodhunt/ubuntu-system-image/rename-userdata-to-writable-for-core

1. rename-userdata-to-writable-for-core
2. Dependent merge proposals