Replaced a missing in adbapi 'safe' with an identical one in utils

Fixes ZEN-15147.
Fixed tests
Merge pull request #18 from zenoss/feature/ZEN-15147

ZEN-15147
Fixed ZEN-15127 issue
Merge remote branch 'upstream/develop' into develop
Updated unit tests