Merge " testing with patches on voltha1.7"