Revert "Change ldap 'master' settings in firstboot.sh"

This reverts commit e4720a5a595119b68ea2c4ecd0b0a30268520aba.

This change was a mistake -- 'master' refers to salt and puppet
but not to ldap.

Change-Id: I4e73c93290403d1134bc67cef9550f2f22dc9e35
Merge "Revert "Change ldap 'master' settings in firstboot.sh"" into production