Redmine#4025: clear up bundle resolution rules