Ported changes from master to fix problem
where PBS_DEFAULT was not being honored on client
commands. TRQ-2286