Renamed ldif import module, to be consistent with upcoming json module
Misc.
More misc.