updates for running with PREFIX=NONE and in bosh-lite