Make fix patch to use parameters active directory and ldap search
Fix set_version.sh tags for 2.1