Remove debug statement.
Add missing code for subdirectory mode detection and support.
Merge branch '7.x-3.x' of git.drupal.org:project/provision into 7.x-3.x