SQOOP-1497: Sqoop2: Entity Nomenclature Revisited
Merge remote-tracking branch 'remotes/origin/SQOOP-1367' into SQOOP-1367