SQOOP-1566: Sqoop2: Fix the upgrade logic for SQOOP-1498

(Veena Basavaraj via Jarek Jarcec Cecho)