fix(intrinsics): Attempt to resolve all intrinsics but leave untouched in failure

[jfuss]

Issue #, if available:
#1386 #1408 #1407

Description of changes:
I described the issue here: #1386 (comment)

Previously, when we encountered an intrinsic we could not resolve, the exception was thrown up to the resource level and we set the original resource into the modified (in memory) template we use for the commands. Instead, this change will only set that property back into the dictionary allowing any intrinsics we can resolve to remain resolved.

Checklist:

• Write Design Document (Do I need to write a design document?)
• Write unit tests
• Write/update functional tests
• Write/update integration tests
• make pr passes
• Write documentation

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