Do not set RPMDIST to '%dist' when dist is not set by the distribution.
Merge branch 'devel' of git://github.com/dirtyharrycallahan/ansible into rpm_change