AVRO-570: Trying to make changes to trunk minimal

 * Remove changes that just add/remove whitespace
 * Remove changes to the shaded jar
 * No longer use maven-assembly-plugin to create '-job.jar'
 * Remove changes that don't have an effect on code correctness/logic
 * Remove changes that just change the order of independent lines