Merge fixes for running bootstrap when script has been loaded in interactive phase.

BUG=
R=jmesserly@google.com

Review URL: https://codereview.appspot.com/13831050