Clean up entity namespaces, fix tests.
Ignore some external namespaces in hiera config.