Merge fix for trq-2327 - output of qstat -f should include BATCH_PARTITION_ID in its variable_list. Also is being marked as TRQ-2480.