SQOOP-1640: Sqoop2: Add the rest of the patch