Smattering of fixes and enhancements for rebalancer

BugzID: 31042
BugzID: 30996