Better help message
Fixing the last of the install setup for SP default config
Fixing the last of the install setup for SP default config
Merge remote branch 'origin/7.x-3.0-qa' into 7.x-3.0-qa