Devtest update, heat-cfntools no longer in images

Change-Id: I10acce1096b46a17a54ed2e7b7ab574234e9f3cf
Merge "Devtest update, heat-cfntools no longer in images"