Resolve conflicts of rebasing
Resolve conflicts of rebasing

fog/fog-azure-rm,vishrutshah/fog-azure-rm,bilal-naeem-confiz/fog-azure-rm,bilal-naeem-confiz/fog-azure-rm,vishrutshah/fog-azure-rm,fog/fog-azure-rm