bump develop to 1.2.1-dev
Merge pull request #14 from zenoss/feature/ZEN-14462.b

Feature/zen 14462.b