Indentation in bootstrap was wrong and some names in cmdlib.py were not
right.

Reviewed-by: imsnah