fix for EUCA-10005
fix for EUCA-10005
Merge pull request #306 from tbeckham/testing

Rename fat fingered cloudformation templates dir
Remove image tagging until we find a way that passes

Change-Id: If783519ca46cd943428aae23fcfe3af2f471c863
Merge remote-tracking branch 'origin/testing' into testing
Merge branch 'testing' of git.qa1.eucalyptus-systems.com:qa-repos/eutester into testing