Merge "Idle maintenance scheduling broken." into jb-mr2-dev