Refs #5029: Allow specifying initial org and location.

Doh! Want to buy linter option :)