RHEL (like Amazon) uses '6Server': override to '6'

Fixes compatibility with the RHEL image on AWS.

(Apologies if this comes over twice - I accidentally deleted the branch for the original PR.)