Merge proposals dependent on lp://staging/~josvaz/ubuntu-on-ec2/ec2-publishing-scripts-lp1602466-xen-fbfront-blacklist

1. ec2-publishing-scripts-lp1602466-xen-fbfront-blacklist
2. Dependent merge proposals