Manual merge of code from 4.1-dev into the 2.5-dev --trq-1461: Missing PBS_ variables on certain nodes.