Cross merge DynamoRaaS stop-gap to 0.7.4_master