[merge] initial change...upload non-streaming jar

The merge was unclean do to slight differences in the naming of the
job.

Signed-off-by: Tim Henderson <tim.tadh@gmail.com>

Conflicts:
	mrjob/emr.py