jar-with-dependencies now correctly assembled

There was a problem where the jar-with-dependencies we build for
non-maven users was ending up with both the shaded and unshaded
protocol buffers dependencies. This of course defeated the
purpose of shading them.