Merge "Use cfn tools under /usr/bin instead of /opt/aws/bin"