idmap code + initial kerberos code
Merge branch 'feature/idmap'