Fix the logic: when --no-cache-clear option is used, make sure the rebuild is really done again in DRUPAL_BOOTSTRAP_FULL