revert bad merge for pull/146 for ZEN-5687 that causes blank infrastructure page
Merge pull request #151 from zenoss/feature/revert-ZEN-5687

revert bad merge for pull/146 for ZEN-5687 that causes blank infrastruct...
Merge branch 'develop' into feature/TA19866