merge develop into v1.22.0

[ShreyaGangishetty]

Issue #, if available:

Description of changes:

Description of how you validated changes:

Checklist:

• Write/update tests
• make pr passes
• Update documentation
• Verify transformed template deploys and application functions as expected
• Add/update example to examples/2016-10-31

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.

[alexw91]

Codecov Report

Merging #1495 into release/v1.22.0 will increase coverage by 0.02%.
The diff coverage is 100.00%.

@@                 Coverage Diff                 @@
##           release/v1.22.0    #1495      +/-   ##
===================================================
+ Coverage            94.10%   94.13%   +0.02%     
===================================================
  Files                   78       78              
  Lines                 4900     4925      +25     
  Branches               988      990       +2     
===================================================
+ Hits                  4611     4636      +25     
  Misses                 134      134              
  Partials               155      155              

---

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 9df2c8a...aba498f. Read the comment docs.