Merge branch 'dev/murrelet' of ssh://gerrit.onosproject.org:29418/onos into dev/murrelet