Updated the executor with all the recent feature and performance improvements that have happened in the master branch with the PriorityScheduledExecutor
A couple comment changes and variable renames
Merge branch 'master' into experimental-more_concurrent_scheduler
We were using the wrong variable here