Merge proposals dependent on lp:~vorlon/platform-api/lp.1465958

lp:~vorlon/platform-api/lp.1465958 has no merge proposals.