Define LDAP country NFP field
Define LDAP objectClass for Status Organization per instrument
Merge remote-tracking branch 'upstream/master'
Moved views to cms.views