SPY-138 DAGScheduler job <--> stage accounting

Pulls in recent Apache changes as well.