Bugfix bad RedHat release version for Amazon Linux
Merge branch 'master' into resource_fixes