Fix org unset
Merge pull request #915 from jkrocil/fix-org-unset

Fix org unset
Fix ldap and aws fixture