Fix for "mach -bootstrap" and new bootstrap script.

Signed-off-by: Frank Mertens <frank@cyblogic.de>