Sync with r31810
Merge branch 'master' of github.com:rhc54/orcm-sched
Cleanup compiler errors
Update ignores