BMC to package Amazon cloud services as part of expanded partnership