Reverting to using voltha-onos master instead of custom test versions

Change-Id: Id9768bc1f938f05b53dc20ad93e7be86c5f6991d
8 files changed