Update according to the latest changes in Utils and Router
Merge branch 'master' of github.com:lotus/controller