FL-487: continued zenoss integration work