Merge "Fix variable has no attribute ldap error during package build"