PT-47008679 - reset keys on delete and fix bug w/previous commit
Merge branch 'reset-keys' into release-4.6-unstable

Conflicts:
	sipXconfig/neoconf/src/org/sipfoundry/sipxconfig/cfgmgt/ConfigManagerImpl.java
Merge branch 'release-4.6-unstable' of github.com:dhubler/sipxecs into release-4.6-unstable