Merge proposals dependent on lp://staging/~dobey/ubuntuone-credentials/fix-ap-deps

lp://staging/~dobey/ubuntuone-credentials/fix-ap-deps has no merge proposals.