diff --git a/zanata-war/src/main/resources/db/changelogs/db.changelog-1.0.xml b/zanata-war/src/main/resources/db/changelogs/db.changelog-1.0.xml
index d57f85bb14..9bc5ac5f84 100644
--- a/zanata-war/src/main/resources/db/changelogs/db.changelog-1.0.xml
+++ b/zanata-war/src/main/resources/db/changelogs/db.changelog-1.0.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<databaseChangeLog
+<databaseChangeLog 
 	xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
-	xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" 
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
 	xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-2.0.xsd
 						http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd">
 
@@ -20,7 +20,7 @@
     	<comment>h2 baseline schema</comment>
     	<sqlFile path="db/h2/h2_baseline.sql" stripComments="true" />
     </changeSet>
-
+    
     <changeSet id="1" author="camunoz@redhat.com" dbms="mysql" failOnError="false" runAlways="true">
     	<comment>Set session's default storage engine to INNODB (mysql ver &gt; 5.5)</comment>
     	<sql>SET storage_engine=InnoDB</sql>
diff --git a/zanata-war/src/main/resources/db/changelogs/db.changelog-1.2.xml b/zanata-war/src/main/resources/db/changelogs/db.changelog-1.2.xml
index c26da8b14f..112adcc7b6 100644
--- a/zanata-war/src/main/resources/db/changelogs/db.changelog-1.2.xml
+++ b/zanata-war/src/main/resources/db/changelogs/db.changelog-1.2.xml
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<databaseChangeLog
+<databaseChangeLog 
 	xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
-	xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" 
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
 	xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-2.0.xsd
 						http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd">
-
+    
     <changeSet author="sflaniga@redhat.com" id="1">
 
     	<validCheckSum>cfb156591044f08e333d7ca2d5638db3</validCheckSum>
 
     	<comment>remove HCommunity tables</comment>
-
+    	
     	<dropForeignKeyConstraint
     		constraintName="FK8BEBF03860C55B1B"
     		baseTableName="HCommunity_Member"/>
diff --git a/zanata-war/src/main/resources/db/changelogs/db.changelog-1.3.xml b/zanata-war/src/main/resources/db/changelogs/db.changelog-1.3.xml
index 277009747a..694fe1eab0 100644
--- a/zanata-war/src/main/resources/db/changelogs/db.changelog-1.3.xml
+++ b/zanata-war/src/main/resources/db/changelogs/db.changelog-1.3.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<databaseChangeLog
+<databaseChangeLog 
 	xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
-	xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" 
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
 	xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-2.0.xsd
 						http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd">
-
+						
     <changeSet author="hding@redhat.com" id="1">
     	<comment>Add flag for project and project version to support a customized list of locales</comment>
 		<addColumn tableName="HProject">
@@ -19,33 +19,33 @@
 			</column>
 		</addColumn>
     </changeSet>
-
+	
     <changeSet author="hding@redhat.com" id="2">
     	<comment>Add tables to store the customized list of locales for project</comment>
 		<createTable tableName="HProject_Locale">
-			<column name="projectId" type="bigint">
+			<column name="projectId" type="bigint"> 
 				<constraints nullable="false" />
 			</column>
 			<column name="localeId" type="bigint">
 				<constraints nullable="false" />
 			</column>
 		</createTable>
-		<addPrimaryKey tableName = "HProject_Locale"
+		<addPrimaryKey tableName = "HProject_Locale" 
 			columnNames = "projectId, localeId"/>
-		<addForeignKeyConstraint
-			baseTableName = "HProject_Locale"
-			baseColumnNames = "projectId"
+		<addForeignKeyConstraint 
+			baseTableName = "HProject_Locale" 
+			baseColumnNames = "projectId" 
 			constraintName = "FKHPROJECTLOCALEPRO"
 			referencedTableName = "HProject"
 			referencedColumnNames = "id"/>
-		<addForeignKeyConstraint
-			baseTableName = "HProject_Locale"
-			baseColumnNames = "localeId"
+		<addForeignKeyConstraint 
+			baseTableName = "HProject_Locale" 
+			baseColumnNames = "localeId" 
 			constraintName = "FKHPROJECTLOCALELOC"
 			referencedTableName = "HLocale"
 			referencedColumnNames = "id"/>
     </changeSet>
-
+	
     <changeSet author="hding@redhat.com" id="3">
     	<comment>Add tables to store the customized list of locales for project version</comment>
 		<createTable tableName="HProjectIteration_Locale">
@@ -56,17 +56,17 @@
 				<constraints nullable="false" />
 			</column>
 		</createTable>
-		<addPrimaryKey tableName = "HProjectIteration_Locale"
+		<addPrimaryKey tableName = "HProjectIteration_Locale" 
 			columnNames = "projectIterationId, localeId"/>
-		<addForeignKeyConstraint
-			baseTableName = "HProjectIteration_Locale"
-			baseColumnNames = "projectIterationId"
+		<addForeignKeyConstraint 
+			baseTableName = "HProjectIteration_Locale" 
+			baseColumnNames = "projectIterationId" 
 			constraintName = "FKHPROJECTITELOCPRO"
 			referencedTableName = "HProjectIteration"
 			referencedColumnNames = "id"/>
-		<addForeignKeyConstraint
-			baseTableName = "HProjectIteration_Locale"
-			baseColumnNames = "localeId"
+		<addForeignKeyConstraint 
+			baseTableName = "HProjectIteration_Locale" 
+			baseColumnNames = "localeId" 
 			constraintName = "FKHPROJECTITELOCLOC"
 			referencedTableName = "HLocale"
 			referencedColumnNames = "id"/>
diff --git a/zanata-war/src/main/resources/db/changelogs/db.changelog-1.4.xml b/zanata-war/src/main/resources/db/changelogs/db.changelog-1.4.xml
index 74232d3103..7220170be8 100644
--- a/zanata-war/src/main/resources/db/changelogs/db.changelog-1.4.xml
+++ b/zanata-war/src/main/resources/db/changelogs/db.changelog-1.4.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<databaseChangeLog
+<databaseChangeLog 
 	xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
-	xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" 
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
 	xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-2.0.xsd
 						http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd">
-
+    
     <changeSet author="camunoz@redhat.com" id="1">
     	<comment>Add a flag indicating when a member of a Language team (locale) is a team coordinator.</comment>
 		<addColumn tableName="HLocale_Member">
@@ -17,7 +17,7 @@
 
 	<changeSet author="damason@redhat.com" id="1">
 		<comment>rename admin email key to zanata from address</comment>
-		<!--
+		<!-- 
 		<sql>update HApplicationConfiguration set key="zanata.email.from.addr" where key="flies.admin.email"</sql>
 		 -->
 		<update tableName="HApplicationConfiguration">
@@ -25,25 +25,25 @@
 			<where>config_key='flies.admin.email'</where>
 		</update>
 	</changeSet>
-
+	
 	<changeSet author="camunoz@redhat.com" id="2">
 	   <preConditions onFail="MARK_RAN">
            <sqlCheck expectedResult="0">
-              select count(*) from HAccountRoleGroup arg, HAccountRole ac1, HAccountRole ac2
+              select count(*) from HAccountRoleGroup arg, HAccountRole ac1, HAccountRole ac2 
               where arg.roleId = ac1.id and arg.memberOf = ac2.id and ac1.name = 'user' and ac2.name = 'translator'
            </sqlCheck>
        </preConditions>
        <comment>
-          Remove language team memberships from all non-translator users.
+          Remove language team memberships from all non-translator users. 
           Only done when users are not part of the translator group by default.
        </comment>
        <delete tableName="HLocale_Member">
            <where>
                personId in
 			   (
-			       select id from HPerson where accountId not in
+			       select id from HPerson where accountId not in 
 		           (
-                       select am.accountId from HAccountMembership am, HAccountRole ar
+                       select am.accountId from HAccountMembership am, HAccountRole ar 
                        where am.memberOf = ar.id
                        and (ar.name = 'translator' or ar.name = 'admin')
                    )
@@ -51,5 +51,5 @@
            </where>
        </delete>
 	</changeSet>
-
+	
 </databaseChangeLog>
\ No newline at end of file
diff --git a/zanata-war/src/main/resources/db/changelogs/db.changelog-1.5.xml b/zanata-war/src/main/resources/db/changelogs/db.changelog-1.5.xml
index cf8dcc2a44..597dbae87d 100644
--- a/zanata-war/src/main/resources/db/changelogs/db.changelog-1.5.xml
+++ b/zanata-war/src/main/resources/db/changelogs/db.changelog-1.5.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<databaseChangeLog
+<databaseChangeLog 
 	xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
-	xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" 
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
 	xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-2.0.xsd
 						http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd">
 
@@ -125,21 +125,21 @@
 				<constraints nullable="false" />
 			</column>
 		</addColumn>
-
+		
 		<addForeignKeyConstraint baseTableName="HGlossaryEntry"
             baseColumnNames="srcLocaleId" constraintName="UKglossaryentry_srcLocaleId"
             referencedTableName="HLocale" referencedColumnNames="id" />
-
+            
          <addColumn tableName="HGlossaryEntry">
             <column name="sourceRef" type="longtext"/>
-        </addColumn>
+        </addColumn>   
 	</changeSet>
-
+	
 	<changeSet author="aeng@redhat.com" id="8" dbms="mysql">
         <comment>Alter glossary tables - remove sourceRef/add auto increment</comment>
-
+        
         <dropColumn tableName="HGlossaryTerm" columnName="sourceRef" />
-
+        
         <addAutoIncrement tableName="HGlossaryEntry" columnName="id" columnDataType="bigint"/>
         <addAutoIncrement tableName="HGlossaryTerm" columnName="id" columnDataType="bigint"/>
         <addAutoIncrement tableName="HTermComment" columnName="id" columnDataType="bigint"/>
@@ -149,7 +149,7 @@
         <comment>Alter glossary tables - remove sourceRef/add auto increment</comment>
         <dropColumn tableName="HGlossaryTerm" columnName="sourceRef" />
     </changeSet>
-
+    
     <changeSet author="aeng@redhat.com" id="9">
         <comment>Alter glossary term table - remove constraint</comment>
         <dropForeignKeyConstraint baseTableName="HTermComment" constraintName="UKtermComment_glossaryTerm" />
@@ -163,7 +163,7 @@
             </column>
         </addColumn>
     </changeSet>
-
+    
     <changeSet author="aeng@redhat.com" id="11">
         <comment>Add obsolete column to HProjectIteration</comment>
         <addColumn tableName="HProjectIteration">
diff --git a/zanata-war/src/main/resources/db/changelogs/db.changelog-1.6.xml b/zanata-war/src/main/resources/db/changelogs/db.changelog-1.6.xml
index 949aa970e4..b8ea0934dc 100644
--- a/zanata-war/src/main/resources/db/changelogs/db.changelog-1.6.xml
+++ b/zanata-war/src/main/resources/db/changelogs/db.changelog-1.6.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<databaseChangeLog
+<databaseChangeLog 
 	xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
-	xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" 
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
 	xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-2.0.xsd
 						http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd">
 
@@ -18,36 +18,36 @@
                 <constraints nullable="false" />
             </column>
         </addColumn>
-
+        
         <addColumn tableName="HProject">
             <column name="status" type="varchar(255)">
                 <constraints nullable="false"/>
             </column>
         </addColumn>
-    </changeSet>
-
+    </changeSet>    
+    
     <changeSet author="aeng@redhat.com" id="2">
         <validCheckSum>8b576cc32f673719e6bc7c6fb272469</validCheckSum>
         <validCheckSum>deb0ab78fddee055f538a735c586ebe6</validCheckSum>
         <comment>Insert HProjectIteration/HProject status column with 'Current'</comment>
-
+        
         <sql>UPDATE HProjectIteration SET status='Current' WHERE active='1'</sql>
         <sql>UPDATE HProjectIteration SET status='Retired' WHERE active='0'</sql>
         <sql>UPDATE HProject SET status='Current'</sql>
     </changeSet>
-
-
+    
+    
 	<changeSet author="aeng@redhat.com" id="3">
 		<comment>Alter HProjectIteration - removed active column</comment>
 		<dropColumn tableName="HProjectIteration" columnName="active" />
 	</changeSet>
-
+	
 	<changeSet author="aeng@redhat.com" id="4">
         <comment>Alter HProjectIteration/HProject - removed obsolete column</comment>
         <dropColumn tableName="HProjectIteration" columnName="obsolete" />
         <dropColumn tableName="HProject" columnName="obsolete" />
     </changeSet>
-
+    
     <changeSet author="aeng@redhat.com" id="5">
         <comment>Update 'Current' to 'ACTIVE' and 'Retired' to 'READONLY'</comment>
         <sql>UPDATE HProject SET status='ACTIVE' WHERE status='Current'</sql>
@@ -55,7 +55,7 @@
         <sql>UPDATE HProjectIteration SET status='ACTIVE' WHERE status='Current'</sql>
         <sql>UPDATE HProjectIteration SET status='READONLY' where status='Retired'</sql>
     </changeSet>
-
+    
     <changeSet author="aeng@redhat.com" id="6">
         <comment>Update 'Obsolete' to 'OBSOLETE'</comment>
         <sql>UPDATE HProject SET status='OBSOLETE' WHERE status='Obsolete'</sql>
@@ -77,7 +77,7 @@
             <column name="status" type="char(1)"/>
         </ext:modifyColumn>
     </changeSet>
-
+    
     <changeSet author="camunoz@redhat.com" id="1-h2" dbms="h2">
     	<comment>Create H2 database Hash function.</comment>
     	<sql>CREATE ALIAS MD5 FOR "org.zanata.util.HashUtil.generateHash"</sql>
@@ -95,7 +95,7 @@
     	<createIndex tableName="HTextFlow" indexName="Idx_ContentHash">
     		<column name="contentHash"/>
     	</createIndex>
-    	<sql>UPDATE HTextFlow SET contentHash = MD5(content)</sql>
+    	<sql>UPDATE HTextFlow SET contentHash = MD5(content)</sql>	
     </changeSet>
 
     <!-- renamed from changeset(camunoz@redhat.com:2 and sflanigan@redhat.com:2) to ensure preconditions are checked again -->
@@ -116,6 +116,6 @@
 	<!--
     This changelog file (despite the filename) is actually part 2 of the changes for Zanata 1.5.
     Please start a new file (eg db.changelog-1.6a.xml) for the 1.6 dev cycle.
-     -->
+     -->   
 
 </databaseChangeLog>
diff --git a/zanata-war/src/main/resources/db/changelogs/db.changelog-1.6a.xml b/zanata-war/src/main/resources/db/changelogs/db.changelog-1.6a.xml
index 281ed90392..17ea09f663 100644
--- a/zanata-war/src/main/resources/db/changelogs/db.changelog-1.6a.xml
+++ b/zanata-war/src/main/resources/db/changelogs/db.changelog-1.6a.xml
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<databaseChangeLog
+<databaseChangeLog 
    xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
-   xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext"
-   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+   xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" 
+   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
    xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-2.0.xsd
                   http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd">
 
     <!--
     This changelog file is the real changelog for Zanata 1.6.
      -->
-
+ 
 	<changeSet author="aeng@redhat.com" id="1" dbms="h2">
         <comment>Alter glossary tables - add auto increment</comment>
         <dropUniqueConstraint tableName="HGlossaryTerm" constraintName="UKglossaryterm_glossary_entry_id"/>
         <dropPrimaryKey tableName="HGlossaryEntry"/>
-        <dropPrimaryKey tableName="HGlossaryTerm"/>
+        <dropPrimaryKey tableName="HGlossaryTerm"/> 
         <dropPrimaryKey tableName="HTermComment"/>
-
+        
         <addAutoIncrement tableName="HGlossaryEntry" columnName="id" columnDataType="bigint"/>
         <addAutoIncrement tableName="HGlossaryTerm" columnName="id" columnDataType="bigint"/>
         <addAutoIncrement tableName="HTermComment" columnName="id" columnDataType="bigint"/>
@@ -38,11 +38,11 @@
 				<constraints nullable="false"/>
 			</column>
 		</createTable>
-		<addForeignKeyConstraint constraintName="FKcontent_text_flow"
+		<addForeignKeyConstraint constraintName="FKcontent_text_flow" 
 			referencedTableName="HTextFlow" referencedColumnNames="id"
 			baseTableName="HTextFlowContent" baseColumnNames="text_flow_id"/>
 	</changeSet>
-
+	
 	<changeSet author="camunoz@redhat.com" id="2">
 		<comment>Add HTextFlowContentHistory table to support plural forms.</comment>
 		<createTable tableName="HTextFlowContentHistory">
@@ -59,23 +59,23 @@
 				<constraints nullable="false"/>
 			</column>
 		</createTable>
-		<addForeignKeyConstraint constraintName="FKcontent_text_flow_history"
+		<addForeignKeyConstraint constraintName="FKcontent_text_flow_history" 
 			referencedTableName="HTextFlowHistory" referencedColumnNames="id"
 			baseTableName="HTextFlowContentHistory" baseColumnNames="text_flow_history_id"/>
 	</changeSet>
-
+	
 	<changeSet author="camunoz@redhat.com" id="3">
 		<comment>Replace content columns from HTextFlow into the new HTextFlowContent table</comment>
 		<sql>
-			insert into HTextFlowContent(content, pos, text_flow_id)
+			insert into HTextFlowContent(content, pos, text_flow_id) 
 			select content, 0, id from HTextFlow
 		</sql>
 		<sql>
-			insert into HTextFlowContentHistory(content, pos, text_flow_history_id)
+			insert into HTextFlowContentHistory(content, pos, text_flow_history_id) 
 			select content, 0, id from HTextFlowHistory
 		</sql>
 	</changeSet>
-
+	
 	<changeSet author="camunoz@redhat.com" id="4">
 		<comment>Add HTextFlowTargetContent table to support plural forms.</comment>
 		<createTable tableName="HTextFlowTargetContent">
@@ -92,11 +92,11 @@
 				<constraints nullable="false"/>
 			</column>
 		</createTable>
-		<addForeignKeyConstraint constraintName="FKcontent_text_flow_target"
+		<addForeignKeyConstraint constraintName="FKcontent_text_flow_target" 
 			referencedTableName="HTextFlowTarget" referencedColumnNames="id"
 			baseTableName="HTextFlowTargetContent" baseColumnNames="text_flow_target_id"/>
 	</changeSet>
-
+	
 	<changeSet author="camunoz@redhat.com" id="5">
 		<comment>Add HTextFlowTargetContentHistory table to support plural forms.</comment>
 		<createTable tableName="HTextFlowTargetContentHistory">
@@ -113,23 +113,23 @@
 				<constraints nullable="false"/>
 			</column>
 		</createTable>
-		<addForeignKeyConstraint constraintName="FKcontent_text_flow_target_history"
+		<addForeignKeyConstraint constraintName="FKcontent_text_flow_target_history" 
 			referencedTableName="HTextFlowTargetHistory" referencedColumnNames="id"
 			baseTableName="HTextFlowTargetContentHistory" baseColumnNames="text_flow_target_history_id"/>
 	</changeSet>
-
+	
 	<changeSet author="camunoz@redhat.com" id="6">
 		<comment>Replace content columns from HTextFlowTarget into the new HTextFlowTargetContent table</comment>
 		<sql>
-			insert into HTextFlowTargetContent(content, pos, text_flow_target_id)
+			insert into HTextFlowTargetContent(content, pos, text_flow_target_id) 
 			select content, 0, id from HTextFlowTarget
 		</sql>
 		<sql>
-			insert into HTextFlowTargetContentHistory(content, pos, text_flow_target_history_id)
+			insert into HTextFlowTargetContentHistory(content, pos, text_flow_target_history_id) 
 			select content, 0, id from HTextFlowTargetHistory
 		</sql>
 	</changeSet>
-
+	
 	<changeSet author="camunoz@redhat.com" id="7">
 		<comment>Remove unnecessary columns / Add new columns</comment>
 		<dropColumn tableName="HTextFlow" columnName="content"/>
@@ -151,7 +151,7 @@
          Make sure db constraints are created.
          Specific problem with MySQL and the MyISAM storage engine (doesn't allow foreign keys)
      -->
-
+	
 	<changeSet author="camunoz@redhat.com" id="8" dbms="mysql">
 		<comment>Change engine to INNODB on MySQL for every table created with liquibase</comment>
 		<sql>alter table HProject_Locale engine = INNODB</sql>
@@ -164,7 +164,7 @@
 		<sql>alter table HTextFlowTargetContent engine = INNODB</sql>
 		<sql>alter table HTextFlowTargetContentHistory engine = INNODB</sql>
 	</changeSet>
-
+	
 	<!-- Foreign Keys in db.changelog-1.3.xml -->
 	<changeSet author="camunoz@redhat.com" id="9" dbms="mysql">
 		<preConditions onFail="MARK_RAN">
@@ -172,9 +172,9 @@
 				<foreignKeyConstraintExists foreignKeyName="FKHPROJECTLOCALEPRO"/>
 			</not>
 		</preConditions>
-		<addForeignKeyConstraint
-			baseTableName = "HProject_Locale"
-			baseColumnNames = "projectId"
+		<addForeignKeyConstraint 
+			baseTableName = "HProject_Locale" 
+			baseColumnNames = "projectId" 
 			constraintName = "FKHPROJECTLOCALEPRO"
 			referencedTableName = "HProject"
 			referencedColumnNames = "id"/>
@@ -185,9 +185,9 @@
 				<foreignKeyConstraintExists foreignKeyName="FKHPROJECTLOCALELOC"/>
 			</not>
 		</preConditions>
-		<addForeignKeyConstraint
-			baseTableName = "HProject_Locale"
-			baseColumnNames = "localeId"
+		<addForeignKeyConstraint 
+			baseTableName = "HProject_Locale" 
+			baseColumnNames = "localeId" 
 			constraintName = "FKHPROJECTLOCALELOC"
 			referencedTableName = "HLocale"
 			referencedColumnNames = "id"/>
@@ -198,9 +198,9 @@
 				<foreignKeyConstraintExists foreignKeyName="FKHPROJECTITELOCPRO"/>
 			</not>
 		</preConditions>
-		<addForeignKeyConstraint
-			baseTableName = "HProjectIteration_Locale"
-			baseColumnNames = "projectIterationId"
+		<addForeignKeyConstraint 
+			baseTableName = "HProjectIteration_Locale" 
+			baseColumnNames = "projectIterationId" 
 			constraintName = "FKHPROJECTITELOCPRO"
 			referencedTableName = "HProjectIteration"
 			referencedColumnNames = "id"/>
@@ -211,14 +211,14 @@
 				<foreignKeyConstraintExists foreignKeyName="FKHPROJECTITELOCLOC"/>
 			</not>
 		</preConditions>
-		<addForeignKeyConstraint
-			baseTableName = "HProjectIteration_Locale"
-			baseColumnNames = "localeId"
+		<addForeignKeyConstraint 
+			baseTableName = "HProjectIteration_Locale" 
+			baseColumnNames = "localeId" 
 			constraintName = "FKHPROJECTITELOCLOC"
 			referencedTableName = "HLocale"
 			referencedColumnNames = "id"/>
 	</changeSet>
-
+	
 	<!-- Foreign Keys in db.changelog-1.5.xml -->
 	<changeSet author="camunoz@redhat.com" id="13" dbms="mysql">
 		<preConditions onFail="MARK_RAN">
@@ -260,7 +260,7 @@
             baseColumnNames="srcLocaleId" constraintName="UKglossaryentry_srcLocaleId"
             referencedTableName="HLocale" referencedColumnNames="id" />
 	</changeSet>
-
+	
 	<!-- Foreign Keys in db.changelog-1.6a.xml -->
 	<changeSet author="camunoz@redhat.com" id="17" dbms="mysql">
 		<preConditions onFail="MARK_RAN">
@@ -268,7 +268,7 @@
 				<foreignKeyConstraintExists foreignKeyName="FKcontent_text_flow"/>
 			</not>
 		</preConditions>
-		<addForeignKeyConstraint constraintName="FKcontent_text_flow"
+		<addForeignKeyConstraint constraintName="FKcontent_text_flow" 
 			referencedTableName="HTextFlow" referencedColumnNames="id"
 			baseTableName="HTextFlowContent" baseColumnNames="text_flow_id"/>
 	</changeSet>
@@ -278,7 +278,7 @@
 				<foreignKeyConstraintExists foreignKeyName="FKcontent_text_flow_history"/>
 			</not>
 		</preConditions>
-		<addForeignKeyConstraint constraintName="FKcontent_text_flow_history"
+		<addForeignKeyConstraint constraintName="FKcontent_text_flow_history" 
 			referencedTableName="HTextFlowHistory" referencedColumnNames="id"
 			baseTableName="HTextFlowContentHistory" baseColumnNames="text_flow_history_id"/>
 	</changeSet>
@@ -288,7 +288,7 @@
 				<foreignKeyConstraintExists foreignKeyName="FKcontent_text_flow_target"/>
 			</not>
 		</preConditions>
-		<addForeignKeyConstraint constraintName="FKcontent_text_flow_target"
+		<addForeignKeyConstraint constraintName="FKcontent_text_flow_target" 
 			referencedTableName="HTextFlowTarget" referencedColumnNames="id"
 			baseTableName="HTextFlowTargetContent" baseColumnNames="text_flow_target_id"/>
 	</changeSet>
@@ -298,7 +298,7 @@
 				<foreignKeyConstraintExists foreignKeyName="FKcontent_text_flow_target_history"/>
 			</not>
 		</preConditions>
-		<addForeignKeyConstraint constraintName="FKcontent_text_flow_target_history"
+		<addForeignKeyConstraint constraintName="FKcontent_text_flow_target_history" 
 			referencedTableName="HTextFlowTargetHistory" referencedColumnNames="id"
 			baseTableName="HTextFlowTargetContentHistory" baseColumnNames="text_flow_target_history_id"/>
 	</changeSet>
@@ -340,7 +340,7 @@
 
             <addUniqueConstraint tableName="HIterationGroup" columnNames="slug" constraintName="UKslug" />
         </changeSet>
-
+        
         <changeSet author="aeng@redhat.com" id="22">
         	<validCheckSum>3:b6b41ac0d5d2e3c845648820ee8c0d3c</validCheckSum>
         	<validCheckSum>3:3d37d4f1aa7834724d24b14dcf83b980</validCheckSum>
@@ -391,6 +391,6 @@
                 <column name="enabledByDefault" type="boolean" valueBoolean="true" defaultValueBoolean="false"/>
             </addColumn>
         </changeSet>
-
+        
 
 </databaseChangeLog>
diff --git a/zanata-war/src/main/resources/db/changelogs/db.changelog-2.0.xml b/zanata-war/src/main/resources/db/changelogs/db.changelog-2.0.xml
index 82b17b0882..332be9e880 100644
--- a/zanata-war/src/main/resources/db/changelogs/db.changelog-2.0.xml
+++ b/zanata-war/src/main/resources/db/changelogs/db.changelog-2.0.xml
@@ -110,7 +110,7 @@
                                  referencedTableName="HAccountRole"
                                  referencedColumnNames="id"/>
     </changeSet>
-
+    
     <changeSet id="6" author="camunoz@redhat.com">
         <comment>Add 'Restricted by Roles' column to HProject table.</comment>
         <addColumn tableName="HProject">
diff --git a/zanata-war/src/main/resources/db/changelogs/db.changelog-2.1.xml b/zanata-war/src/main/resources/db/changelogs/db.changelog-2.1.xml
index a26ebbcef8..b1b3ba8bc5 100644
--- a/zanata-war/src/main/resources/db/changelogs/db.changelog-2.1.xml
+++ b/zanata-war/src/main/resources/db/changelogs/db.changelog-2.1.xml
@@ -48,14 +48,14 @@
             DELETE FROM HAccountActivationKey where accountId in(select acc.id from HAccount acc where acc.enabled = 1)
         </sql>
     </changeSet>
-
+    
     <changeSet id="4" author="aeng@redhat.com">
 		<comment>Add HPersonEmailValidationKey table</comment>
 		<createTable tableName="HPersonEmailValidationKey">
 			 <column name="id" type="bigint" autoIncrement="true">
                 <constraints primaryKey="true" nullable="false" />
             </column>
-			<column name="keyHash" type="varchar(32)">
+			<column name="keyHash" type="varchar(32)"> 
 				<constraints nullable="false" unique="true"/>
 			</column>
 			<column name="personId" type="bigint">
@@ -68,7 +68,7 @@
 				<constraints nullable="false" />
 			</column>
 		</createTable>
-		<addForeignKeyConstraint constraintName="FK_HPersonEmailValidationKey_HPerson"
+		<addForeignKeyConstraint constraintName="FK_HPersonEmailValidationKey_HPerson" 
 			referencedTableName="HPerson" referencedColumnNames="id"
 			baseTableName="HPersonEmailValidationKey" baseColumnNames="personId"/>
 	</changeSet>
diff --git a/zanata-war/src/main/resources/db/changelogs/db.changelog-2.2.xml b/zanata-war/src/main/resources/db/changelogs/db.changelog-2.2.xml
index 3deb460cf7..8d4b996079 100644
--- a/zanata-war/src/main/resources/db/changelogs/db.changelog-2.2.xml
+++ b/zanata-war/src/main/resources/db/changelogs/db.changelog-2.2.xml
@@ -12,12 +12,12 @@
             <column name="defaultProjectType" type="varchar(255)"/>
         </addColumn>
     </changeSet>
-
+    
     <changeSet id="2" author="alex.eng@redhat.com">
         <comment>drop projecttype column in HProject</comment>
         <dropColumn tableName="HProject" columnName="projecttype"/>
     </changeSet>
-
+    
     <changeSet id="3" author="alex.eng@redhat.com">
         <comment>Add projectType column to HProjectIteration</comment>
         <addColumn tableName="HProjectIteration">
@@ -53,9 +53,9 @@
                 <constraints nullable="false" />
             </column>
         </createTable>
-        <addPrimaryKey tableName = "HProject_Validation"
+        <addPrimaryKey tableName = "HProject_Validation" 
 			columnNames = "projectId, validation"/>
-        <addForeignKeyConstraint constraintName="FK_HProject_Validation_HProject"
+        <addForeignKeyConstraint constraintName="FK_HProject_Validation_HProject" 
 			referencedTableName="HProject" referencedColumnNames="id"
 			baseTableName="HProject_Validation" baseColumnNames="projectId"/>
     </changeSet>
@@ -66,7 +66,7 @@
             <column name="overrideValidations" type="boolean" defaultValueBoolean="false"/>
         </addColumn>
     </changeSet>
-
+    
     <changeSet id="6" author="alex.eng@redhat.com">
         <comment>Add HProjectIteration_Validation table.</comment>
         <createTable tableName="HProjectIteration_Validation">
@@ -77,20 +77,20 @@
                 <constraints nullable="false" />
             </column>
         </createTable>
-        <addPrimaryKey tableName = "HProjectIteration_Validation"
+        <addPrimaryKey tableName = "HProjectIteration_Validation" 
 			columnNames = "projectIterationId, validation"/>
-        <addForeignKeyConstraint constraintName="FK_HProjectIteration_Validation_HProjectIteration"
+        <addForeignKeyConstraint constraintName="FK_HProjectIteration_Validation_HProjectIteration" 
 			referencedTableName="HProjectIteration" referencedColumnNames="id"
 			baseTableName="HProjectIteration_Validation" baseColumnNames="projectIterationId"/>
     </changeSet>
-
+    
     <changeSet id="7" author="alex.eng@redhat.com">
         <comment>Add overrideValidations column to HProjectIteration</comment>
         <addColumn tableName="HProjectIteration">
             <column name="overrideValidations" type="boolean" defaultValueBoolean="false"/>
         </addColumn>
     </changeSet>
-
+    
     <changeSet id="8" author="alex.eng@redhat.com">
         <comment>Add creationDate column to HAccountActivationKey</comment>
         <addColumn tableName="HAccountActivationKey">