GCP-7958
revert fix
Merge branch 'branch_release_20140410' of https://github.com/digitalabs/IBPWorkbench into branch_release_20140410
Merge branch 'branch_release_20140410' of https://github.com/digitalabs/IBPWorkbench into branch_release_20140410
GCP-8241 - recover from missing listnms