Merge proposals dependent on lp://staging/~jamesodhunt/ubuntu-system-image/system-image-server-remove-slash-android-for-ubuntu-core

1. system-image-server-remove-slash-android-for-ubuntu-core
2. Dependent merge proposals