SQOOP-1547

SQOOP-1551

Details are in the associated tickets