IAM policies now URL encoded - EUCA-10090
Register new UFS services on upgrade when needed - EUCA-10209
Merge remote-tracking branch 'origin/dev/sjones/EUCA-10209' into testing