Merge pull request #3070 from kgaillot/scheduler
Fix optional colocation outweighing infinite stickiness