merge master into develop

[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.

[codecov-io]

Codecov Report

Merging #1521 into develop will not change coverage by %.
The diff coverage is n/a.

@@           Coverage Diff            @@
##           develop    #1521   +/-   ##
========================================
  Coverage    94.10%   94.10%           
========================================
  Files           78       78           
  Lines         4951     4951           
  Branches       999      999           
========================================
  Hits          4659     4659           
  Misses         135      135           
  Partials       157      157           

---

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 8800817...0ba2561. Read the comment docs.