SQOOP-989: Sqoop2: setenv.sh overrides value of JAVA_OPTS

(Mark Grover via Jarek Jarcec Cecho)
SQOOP-982: Sqoop2: Allow user to pass custom parameters to catalina.sh

(Mark Grover via Jarek Jarcec Cecho)