Fix name collisions between service-defined shapes and framework types#682

Alan4506 wants to merge 2 commits intosmithy-lang:developsmithy-lang/smithy-python:developfrom

Alan4506:fix/name-collision-importsAlan4506/smithy-python:fix/name-collision-importsCopy head branch name to clipboard