Squash and merge up commits for Insight broker ng upgrades