Updated for the change option names that have been committed thus far
Updated for the change option names that have been committed thus far

bbockelm/glideinWMS,bbockelm/glideinWMS,bbockelm/glideinWMS,bbockelm/glideinWMS