Merge "new files for testing voltha master branch"