Fix resolution of functions.bat (issue #1532)
Remove unnecessary block (issue #1533)

Conflicts:
	packaging/standalone/src/main/distribution/shell-scripts/bin/Neo4jInstaller.bat
Handle Java paths with spaces in them (#1534)