Merge from trunk fix for TRQ-2208: qhold hangs when the attribute on the pbs_server display_job_server_suffix = False.