Merge "(bug 37263) better handling of minor/bot in enhanced changelist"