Revert "do not include autofs and openldap"

This reverts commit 092a31adfd2db03f77ec90d660c2c9bad7b871f5.