Stashing stuff to get Cupps changes.
Fixing merge issue.
Minor cleanup -- removed echo from shutdown command and added -eux for bash scripts
Merge branch 'master' of github.com:cloudspace-devops/packer-image-scripts
Too many changes for one commit.
Fixing merge conflicts.