They now share most of the code again, this time via subclassing, and they share some code with enrol/ldap. They have also gained some features and a few fixes.