Index: lams_common/db/sql/updatescripts/alter_21_branching.sql
===================================================================
diff -u -r20be71f75a759599684ff883011b2028098678e5 -rf489b0fb40f65bdea9e3366872ab9ab838a84b02
--- lams_common/db/sql/updatescripts/alter_21_branching.sql	(.../alter_21_branching.sql)	(revision 20be71f75a759599684ff883011b2028098678e5)
+++ lams_common/db/sql/updatescripts/alter_21_branching.sql	(.../alter_21_branching.sql)	(revision f489b0fb40f65bdea9e3366872ab9ab838a84b02)
@@ -99,6 +99,7 @@
 ALTER TABLE lams_system_tool ADD COLUMN admin_url TEXT;
 
 
+-- LDEV-1301
 ALTER TABLE lams_configuration 
 ADD COLUMN description_key VARCHAR(255)
 , ADD COLUMN header_name VARCHAR(50)
@@ -176,3 +177,6 @@
 insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) values ('LDAPOnlyOneOrg', 'true', 'config.ldap.only.one.org', 'config.header.ldap', 'BOOLEAN', 1);
 insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) values ('LDAPEncryptPasswordFromBrowser', 'true', 'config.ldap.encrypt.password.from.browser', 'config.header.ldap', 'BOOLEAN', 1);
 insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) values ('LDAPSearchResultsPageSize', '100', 'config.ldap.search.results.page.size', 'config.header.ldap', 'LONG', 0);
+
+delete from lams_configuration where config_key='LamsHome';
+delete from lams_configuration where config_key='FileManagerDir';