Better support of Linux
Merge branch 'master' of https://github.com/jmarranz/relproxy

Conflicts:
	test_cmd/test_java_shell_interactive_launcher.sh
	test_cmd/test_java_shell_launcher.sh
	test_cmd/test_java_shell_launcher_2.sh
	test_cmd/test_java_shell_launcher_complete_class.sh
	test_cmd/test_java_shell_launcher_complete_class_2.sh
	test_cmd/test_java_shell_launcher_normal_class.sh
	test_cmd/test_java_shell_snippet_launcher.sh