Added back dependency on Enterprise service api IMPL... We neeed this after all.
Changed dependencies of 'publish-to-zip' target so we do a build_normal before attempting to build zip, making sure that the .JAR file is built and ready to copy.