Upstream merge
Update maven shade plugin so that newer maven versions (ie travis) will compile.