DS-1105: Checked in changes to canonical_config.yml to build sli.properties to use local in memory ldap, when -Dsli.env is set to either local-ldap-server or local-sandbox-ldap-server.
Merge branch 'master' into ds1104
Merge branch 'master' into ds1105
DS-1105: Checked in changes for admin-rails app, which can be used by following instructions on wiki:  https://wiki.inbloom.org/display/DEV/LDAP+-+In+Memory