Disabled individual user confirmation for users with roles
CATEGORY_EDITOR or GALLERY_EDITOR only.
Added initial support for using facets with the Solr Collector.
Added thread-safe implementation of OpenCmsSolrHandler.
Enabled that solr target fields of search settings from XML contents can
be attached to the container pages where the contents are located.
Fixed bug with error when switching back to "Best available" Editor in
the user settings.
Fixed role group update during startup.
Fixed problem with reading roles for webuser OUs.
Improved build number handling for Milestone builds.
Mapping properties to Solr string datatypes.
Added option to use permanent redirects for a secure site. 
Conflicts:
	src/org/opencms/configuration/CmsSystemConfiguration.java
	src/org/opencms/configuration/opencms-system.dtd
	src/org/opencms/main/OpenCmsCore.java
	src/org/opencms/site/CmsSite.java
	src/org/opencms/site/CmsSiteManagerImpl.java
Fixed problem where the secure server prefix was not being used in some
cases for detail page links in the XML sitemap. 
Conflicts:
	src/org/opencms/staticexport/CmsDefaultLinkSubstitutionHandler.java
Added "forceSecure" parameter for getOnlineLink/getServerLink methods.
Added new method to customize link processing for https links.
Changed isSecureLink to use a value  of 'both' for the 'secure' property if the resource can not be read.
Added attribute to request context which indicates whether the current
request is going to a secure site and used this in the link substitution
handler. 
Conflicts:
	src/org/opencms/main/CmsContextInfo.java
	src/org/opencms/staticexport/CmsDefaultLinkSubstitutionHandler.java
Fixed problem with workplace search dialog 'losing' the current
directory.
Changed handling for secure links.
Conflicts:
	src/org/opencms/site/CmsSite.java
Reverted previous change so that links to resources under /shared are no
longer automatically treated as if they had the property 'secure=both'.
Fixed NPE during static export after publishing.
Fixed test case issue when reading files from path with space chars.