GCP-7958
Revert "GCP-7958"

This reverts commit b8f9b4e99ca1170a6b4bd37247e198361534f4d7.
Merge branch 'branch_release_20140410' of https://github.com/digitalabs/IBPCommons into branch_release_20140410
Merge branch 'branch_release_20140410' of https://github.com/digitalabs/IBPCommons into branch_release_20140410
GCP-8241 - recover from missing listnms