Map Amazon Linux release versions to RedHat equivalents
Merge branch 'master' into resource_fixes