Handle deferred from applyMaps.

Fixes ZEN-12397.
Simplify handling applyMaps deferred.

Fixes ZEN-12397.
Cleanup handling of applyMaps deferred.

Fixes ZEN-12397.
Merge pull request #7 from zenoss/feature/ZEN-12397

Please review branch feature/ZEN-12397