use custom password
Merge branch '9.4'

Conflicts:
	start
ensure 9.3
use PASSWORD