SQOOP-1586: Sqoop2: Rename leftovers from the SQOOP2 merge of 1367

(Veena Basavaraj via Jarek Jarcec Cecho)