addressed review issues

1 job for jenkins-migration-to-aws-2 in 2 minutes and 8 seconds (queued for 9 seconds)
latest