Merge branch 'onos-tutorial' of ssh://gerrit.onlab.us:29418/ONOS-VM into onos-tutorial