Merge branch 'master' into feature/stabilization
ECMS-6238: Cannot upload file whose name contains [ character in Activity Composer

Fix description:
- Make uploading file and creating folder in Activity Composer consistent with the same method in Content Explorer
ECMS-5395: Renaming content in Webdav does not change its publication state

Fix description:
- Fire the event POST_EDIT_CONTENT_EVENT to change publication state to draft when rename content
- Check if destination node is not folder before updating its mime type

Conflicts:
	core/services/src/main/java/org/exoplatform/services/cms/webdav/WebDavServiceImpl.java
ECMS-6312: [Product] Redundant bullets in Document View

Fix description:
- Restore style of nav-tabs element to avoid regression

Conflicts:
	apps/resources-wcm/src/main/webapp/skin/DefaultSkin/webui/UITreeJCRExplorer/Stylesheet.css
ECMS-6095: Comments are not displayed on SCV in live mode

Fix description:
- Display all comments of original node instead of frozen node
ECMS-6209: Incorrect description of Pending status

Problem analysis:
* In publication history property, each status has a constant of publication status description.
  This constant will be used to render i18n label.

Fix description:
* Update the constant of Pending status description.
ECMS-6183: [CLV] Deleted content appears in CLV setting

Fix description:
  - Skip to display content if the target does not exist
  - Check the item availability when rendering tooltip
  - Handle also the case when target folder is removed

Conflicts:
	apps/portlet-presentation/src/main/webapp/groovy/ContentListViewer/UICLVConfig.gtmpl
ECMS-6231 Wrong Comparison method in PropertyValueComparator

Fix description: use new method compareLong to compare as a number, instead of a string, when property type is kind of Long or Double.
PLF-5974: Cannot start PLF with MySQL in UTF-8 (ecms)

Fix description:
- Add dialect to repository configuration
ECMS-6278: Migrate binary data which contain old path "sites content/live" in URLs

Fix description:
- In SanitizationUpgradePlugin, add migrateJCRDataContents() method to replace the old path by the new one used in Platform 4.
  Limit the migration to HTML, CSS, JS files.

Conflicts:
	upgrade-plugins/src/main/java/org/exoplatform/ecms/upgrade/sanitization/SanitizationUpgradePlugin.java
ECMS-6234 PropertyValueComparator class is duplicated in both core service and webui

Fix description:
- Delete PropertyValueComparator class in webui.
- Only use PropertyValueComparator in core service.
- Update compare() method of the kept PropertyValueComparator to handle the case of missing properties
  such as owner, publication state of a folder, or author of built-in folders.

Conflicts:
	core/webui-explorer/src/main/java/org/exoplatform/ecm/webui/component/explorer/UIJCRExplorer.java
ECMS-6234 PropertyValueComparator class is duplicated in core service and in webui
Fix description: re-add PropertyValueComparator in core webui to use in platform.
ECMS-6219: Unable to put > in css file

Fix description:
- Avoid the sanitization in CSS content
- Encode css data when rendering it as a file to avoid XSS attack
ECMS-6221: Missing exo:titlePublished value with fastPublish

Fix description
  -  Broadcast the state update when clicking fastPublish (from CLV or inside Content Explorer).
     exo:titlePublished is then added correctly as in traditional Publication Management.
ECMS-6229 replace node.remove() by trashService.moveToTrash()
ECMS-6256: Incorrect sort by title using categoryList template in content list portlet

Fix description:
- In case of sorting taxonomy, use exo:name as sort creteria instead of exo:titlePublished

Conflicts:
	core/publication/src/main/java/org/exoplatform/services/wcm/publication/WCMComposerImpl.java
ECMS-4880: Cannot go directly to a user folder with username as email address

Fix description:
- Remove @ as an illegal character in ECMS
ECMS-6193: Advanced search: Impossible to search with date constraints

Problem analysis:
- ECMS-5904 escapes "less than" and "greater than" characters in date constraints because these marks are also used in XSS scripts.
  These escaped values are then stored in DB. It is therefore impossible to execute search query with date constraints.

Fix description:
- Revert ECMS-5904 and escape XSS characters in gtmpl file when rendering the form.

Conflicts:
	core/webui/src/main/resources/groovy/ecm/webui/form/UIFormInputSetWithAction.gtmpl
vi injection on 20140720-005938
ECMS-6122: [Quick Creation Menu] Upload file popup displays again after clicking Close

Fix description
* Remove the popup object after closing the upload form.