Bug 3162 - Add awsbox support