Some minor fixes and updates

Fixed a couple of bugs in deployment gradle plugin and updated Web and
FunctionalTest projects to support the latest UserService changes