fixes #2549, fixes #2544 - new host organization and location should default to current context if it exists