rework v5 migration for azure support
v5.0.1 for azure migrations
Merge remote-tracking branch 'upstream/master'
Align to BrockAllen project