resolving merge conflict-2
resolving merge conflict-2

bpramod/azure-linux-extensions,bpramod/azure-linux-extensions,bpramod/azure-linux-extensions,bpramod/azure-linux-extensions,bpramod/azure-linux-extensions,bpramod/azure-linux-extensions,bpramod/azure-linux-extensions