Remove a comma as a test of a gitflow feature branches
Help the cherry-pick of TRQ-2377.
Help the cherry-pick for TRQ-2373. Make the error message accurate.
Help the cherry-pick for TRQ-2347's original fix.
Help the cherry-pick for TRQ-2347's unit test.
Fix some coverity issues.
Perform a complete merge with 4.5-dev - which has been merged with 4.2-dev. Hopefully we now have moved the changesets missing from 4.5-dev into develop. More checks are coming, but this should get the bulk of everything.
Fixed handle_job_recovery to be able to properly handle
array jobs and still not allow duplicate entries.
TRQ-2492
TRQ-2501. Help the cherry-pick.
Help the cherry-pick for adding speed instrumentation to TORQUE.
Put in a retry loop in qsub if a request fails to reduce the
number of permanent failures while making the call. TRQ-2417
Fixed two small memory leaks. TRQ-2498
Made a change to log_remove_old to alleviate a problem
where the current mom_log is deleted when $log_keep_days
is set. For NFS file systems it seems that the math
we were using to decide if a file should be deleted made it possible
for the current file to be deleted if the NFS server time and
pbs_mom host time were off slightly. TRQ-1305
Added unit tests for log_remove_old. TRQ-1305
Fix some coverity issues.
Fixed deadlock found by Coverity scan.

Conflicts:

	src/server/queue_recycler.c
Fixed a cherry-pick problem from Master for a deadlock
Fix for trq-2484: TROQUE is not honoring environment variables that don't have a value.
Added unit test for TRQ-2484: Torque not honoring env. variables that have empty values.
Corrected a message for a unit test.