added gr_ldap_options

This is a hash of LDAP options that are added to the local_settings.py
file. Each key and value are added via ldap.set_option.
ldap options hash needs to be sorted to prevent spurious puppet changes
Merge branch 'ldap_options'

Conflicts:
	templates/opt/graphite/webapp/graphite/local_settings.py.erb