NA SM: fix release of invalid addresses (fix #445)
NA SM: fix release of invalid addresses (fix #445)

Clean up address resolution code

mercury-hpc/mercury,mercury-hpc/mercury,mercury-hpc/mercury,mercury-hpc/mercury