Merge pull request #404 from n-shiota/ONOS127

Partial work of ONOS-127