PT-47008679 - Add reset keys button to ui
PT-47008679 - Add reset keys button to ui

Conflicts:

	sipXconfig/neoconf/src/org/sipfoundry/sipxconfig/cfgmgt/ConfigManager.java
PT-47008679 - forgot file
Merge branch 'reset-keys' into release-4.6-unstable