add component guids to threshold events
Merge branch 'develop' of https://github.com/zenoss/zenoss-prodbin into feature/component_guid_events
fixes
fix comment typo
Allow applyDataMaps via a router/facade call
Audit that a model change happened from the api
use zenjobs with facade applydatamaps
Merge branch 'develop' into feature/applyDataMap_via_router
Fix merge conflict
Revert zenjobs updates
Merge branch 'develop' into feature/applyDataMap_via_router
Fixes ZEN-13788: zencatalog run will not terminate (reviewed by epowell)
Merge pull request #314 from burbel/ZEN-13788

Fixes ZEN-13788: zencatalog run will not terminate (reviewed by epowell)
ZEN-11054: Direction stays where it was catched by refresh
ZEN-11800: Pasting in large log entries at Event console
Merge pull request #315 from zenoss/feature/ZEN-11054

ZEN-11054: Direction stays where it was catched by refresh
Merge pull request #316 from zenoss/feature/ZEN-11800

ZEN-11800: Pasting in large log entries at Event console
ZEN-10501: snmpwalk from run commands should not show zproperties
Merge pull request #317 from zenoss/feature/ZEN-10501

ZEN-10501: snmpwalk from run commands should not show zproperties
fixes ZEN-13807 reviewed by epowell explicity set the height and width when resizing extjs portlets