Merge branch 'master' of https://github.com/shun159/topology_manager into trema_integration
Merge branch 'trema_integration' of https://github.com/shun159/topology_manager into trema_integration