Merge divergent histories#2

rharris-nitro wants to merge 3 commits intomainNitro/nitro-platform-sample-code:mainfrom

merge-divergent-historiesNitro/nitro-platform-sample-code:merge-divergent-historiesCopy head branch name to clipboard