Updates to import_site_spec.rb and related items.
Merge remote-tracking branch 'origin/version2.9' into version2.9