Merge pull request #10 from andybavier/master

Abandoning voltha-2.1 branch