Use the new RRD names - merge from tag_v2_4_2_jeff_fdxml_3
Use the new RRD names - merge from tag_v2_4_2_jeff_fdxml_3

holzman/glideinwms-old,holzman/glideinwms-old,holzman/glideinwms-old,bbockelm/glideinWMS,bbockelm/glideinWMS,bbockelm/glideinWMS,bbockelm/glideinWMS