Merge "Make use of Ubuntu Cloud Archive switchable"