SQOOP-1220. Sqoop2: Improve default catalina.properties file to work out of the box on both Hadoop 1 and 2

(Jarek Jarcec Cecho via Hari Shreedharan)