SCHEMA-317. Makes GenericsOptionsParser used flags consistent betweeh Hadoop1 and 2.

review: https://review.kiji.org/r/279/