Put back the changes that were introduced in response to pylint before the merge
Put back the changes that were introduced in response to pylint before the merge

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