Merge branch 'master' into ENG-3236-adhocparams
Minor AdHocPlannerWork API cleanup.
Merge remote-tracking branch 'origin/ENG-3236-adhocparams' into ENG-3236-adhocparams