(cherry picked from commit 893548addb)
893548addb
* Update Shippable integration test groups. * Update integration test group aliases. * Rebalance AWS and Azure tests with extra group. * Rebalance Windows tests with another group.
* Fix nested noop block padding in dynamic includes * Address issues from the review * Fix typo