diff --git a/config/alfresco/messages/patch-service.properties b/config/alfresco/messages/patch-service.properties
index be27d41f71..c2f04aca09 100644
--- a/config/alfresco/messages/patch-service.properties
+++ b/config/alfresco/messages/patch-service.properties
@@ -19,16 +19,16 @@ patch.general.property_not_set=Patch property ''{0}'' has not been set on this p
 patch.marker.description=Marker patch to record installations and upgrades
 patch.marker.result=Marker patch applied
 
-patch.savedSearchesFolder.description=Ensures the existence of the ''Saved Searches'' folder.
+patch.savedSearchesFolder.description=Ensures the existence of the 'Saved Searches' folder.
 patch.savedSearchesFolder.result.exists=The saved searches folder already exists: {0}
 patch.savedSearchesFolder.result.created=The saved searches folder was successfully created: {0}
 
-patch.savedSearchesPermission.description=Sets required permissions on ''Saved Searches'' folder.
-patch.savedSearchesPermission.result.applied=Granted CONTRIBUTOR role to EVERYONE on ''Saved Searches'' folder: {0}.
-patch.savedSearchesPermission.err.not_found=''Saved Searches'' folder could not be found.
+patch.savedSearchesPermission.description=Sets required permissions on 'Saved Searches' folder.
+patch.savedSearchesPermission.result.applied=Granted CONTRIBUTOR role to EVERYONE on 'Saved Searches' folder: {0}.
+patch.savedSearchesPermission.err.not_found='Saved Searches' folder could not be found.
 
-patch.updatePermissionData.description=Update permissions from ''folder'' to ''cmobject'' [JIRA: AR-344].
-patch.updatePermissionData.result=Changed {0} ''folder'' access control entries to ''cmobject''.
+patch.updatePermissionData.description=Update permissions from 'folder' to 'cmobject' [JIRA: AR-344].
+patch.updatePermissionData.result=Changed {0} 'folder' access control entries to 'cmobject'.
 
 patch.authoritiesFolder.description=Ensures the existence of the user authorities folder [JIRA: AR-497].
 
@@ -38,26 +38,26 @@ patch.guestUser.result=Added guest user and fixed permissions.
 patch.fixNodeSerializableValues.description=Ensure that property values are not stored as Serializable if at all possible
 patch.fixNodeSerializableValues.result=Fixed {0} node property serialized values
 
-patch.updateGuestPermission.description=Rename guest permission from 'Guest' to ''Consumer''
-patch.updateGuestPermission.result=Changed {0} ''Guest'' access control entries to ''Consumer''.
+patch.updateGuestPermission.description=Rename guest permission from 'Guest' to 'Consumer'
+patch.updateGuestPermission.result=Changed {0} 'Guest' access control entries to 'Consumer'.
 
-patch.categoryRootPermission.description=Sets required permissions on ''Category Root'' folder.
-patch.categoryRootPermission.result=Granted CONSUMER role to GUEST on ''Category Root'' folder: {0}.
-patch.categoryRootPermission.err.not_found=''Category Root'' folder ({0}) could not be found.
+patch.categoryRootPermission.description=Sets required permissions on 'Category Root' folder.
+patch.categoryRootPermission.result=Granted CONSUMER role to GUEST on 'Category Root' folder: {0}.
+patch.categoryRootPermission.err.not_found='Category Root' folder ({0}) could not be found.
 
-patch.guestPersonPermission.description=Change Guest Person permission from ''Consumer'' to ''Read''
-patch.guestPersonPermission.result=Updated Guest Person permission from ''Consumer'' to ''Read''
+patch.guestPersonPermission.description=Change Guest Person permission from 'Consumer' to 'Read'
+patch.guestPersonPermission.result=Updated Guest Person permission from 'Consumer' to 'Read'
 
-patch.spacesRootPermission.description=Change Spaces store root permission from ''Consumer'' to ''Read''
-patch.spacesRootPermission.result=Updated Spaces store root permission from ''Consumer'' to ''Read''
+patch.spacesRootPermission.description=Change Spaces store root permission from 'Consumer' to 'Read'
+patch.spacesRootPermission.result=Updated Spaces store root permission from 'Consumer' to 'Read'
 
-patch.contentPermission.description=Update permission entries from 'cm:content' to ''sys:base''.
-patch.contentPermission.result=Changed {0} ''cm:content'' access control entries to ''sys:base''.
+patch.contentPermission.description=Update permission entries from 'cm:content' to 'sys:base'.
+patch.contentPermission.result=Changed {0} 'cm:content' access control entries to 'sys:base'.
 
 patch.forumsIcons.description=Updates forums icon references
 patch.forumsIcons.result=Updated {0} icon references
 
-patch.emailTemplatesFolder.description=Ensures the existence of the ''Email Templates'' folder.
+patch.emailTemplatesFolder.description=Ensures the existence of the 'Email Templates' folder.
 patch.emailTemplatesFolder.result.exists=The email templates folder already exists: {0}
 patch.emailTemplatesFolder.result.created=The email templates folder was successfully created: {0}
 
@@ -67,7 +67,7 @@ patch.emailTemplatesContent.result=Imported the Email Templates into the default
 patch.descriptorUpdate.description=Update Repository descriptor
 patch.descriptorUpdate.result=Repository descriptor updated
 
-patch.scriptsFolder.description=Ensures the existence of the ''Scripts'' folder.
+patch.scriptsFolder.description=Ensures the existence of the 'Scripts' folder.
 patch.scriptsFolder.result.exists=The scripts folder already exists: {0}
 patch.scriptsFolder.result.created=The scripts folder was successfully created: {0}
 
@@ -82,15 +82,15 @@ patch.actionRuleDecouplingPatch.result=Updated {0} rules.
 patch.systemWorkflowFolder.description=Ensures the existence of the system workflow container.
 patch.systemWorkflowFolder.result.created=Created system workflow container {0}.
 
-patch.rssTemplatesFolder.description=Ensures the existence of the ''RSS Templates'' folder.
+patch.rssTemplatesFolder.description=Ensures the existence of the 'RSS Templates' folder.
 patch.rssTemplatesFolder.result.exists=The RSS Templates folder already exists: {0}
 patch.rssTemplatesFolder.result.created=The RSS Templates folder was successfully created: {0}
 
 patch.uifacetsAspectRemovalPatch.description=Removes the incorrectly applied uifacets aspect from presentation template files.
 patch.uifacetsAspectRemovalPatch.updated=Successfully removed the uifacets aspect from {0} presentation template files.
 
-patch.guestPersonPermission2.description=Change Guest Person permission to visible by all users as ''Consumer''.
-patch.guestPersonPermission2.result=Updated Guest Person permission to visible by all users as ''Consumer''.
+patch.guestPersonPermission2.description=Change Guest Person permission to visible by all users as 'Consumer'.
+patch.guestPersonPermission2.result=Updated Guest Person permission to visible by all users as 'Consumer'.
 
 patch.schemaUpgradeScript.description=Ensures that the database upgrade script has been run.
 patch.schemaUpgradeScript.err.not_executed=The schema upgrade script, ''{0}'', has not been run against this database.