Escaping fix for IAM Policy wildcard conversion - EUCA-7726

EUCA-7726
Merge remote-tracking branch 'origin/dev/sjones/EUCA-7726' into testing