Fix for bug 927154
Fixing multiple issues in remove-gear command of admin script