Refs #5029: Updates for initial org and location in Foreman.
Merge pull request #4487 from ehelms/refs-5029

Refs #5029: Updates for initial org and location in Foreman.