restored maven-shade-plugin + lots of cosmetics

Change-Id: I4123e6fcf36a882678710e7d2bc54a25c0506d2a