Merge remote-tracking branch 'upstream/configuration' into 161228_config

Conflicts:
	src/adminserver/systemcfg/store/json/driver_json_test.go
	src/adminserver/systemcfg/systemcfg_test.go

docs/swagger.yaml

@@ -6,7 +6,7 @@ info:
   description: These APIs provide services for manipulating Harbor project.
   version: "0.3.0"
 # the domain of the service
-host: localshot
+host: localhost
 # array of all schemes that your API supports
 schemes:
   - http
@@ -1827,13 +1827,13 @@ definitions:
       ldap_url: 
         type: string
         description: The url of ldap service.
-      ldap_searchdn:
+      ldap_search_dn:
         type: string
         description: The search dn of ldap service.
-      ldap_search_pwd:
+      ldap_search_password:
         type: string
         description: The search password of ldap service.
-      ldap_basedn:
+      ldap_base_dn:
         type: string
         description: The base dn of ldap service.
       ldap_filter:
@@ -1846,7 +1846,7 @@ definitions:
         type: integer
         format: int64
         description: The serach scope of ldap service.
-      ldap_connect_timeout:
+      ldap_connection_timeout:
         type: integer
         format: int64
         description: The connect timeout of ldap service(second).

src/adminserver/systemcfg/systemcfg_test.go

@@ -85,6 +85,7 @@ func TestSystemcfg(t *testing.T) {
 	}
 
 	cfg[comcfg.AUTHMode] = comcfg.LDAPAuth
+
 	if err = UpdateSystemCfg(cfg); err != nil {
 		t.Errorf("failed to update system configurations: %v", err)
 		return