KERN-3097 Do not mix Jackrabbit & SparseMapContent tag storage
NOJIRA Added metatype = true to the LocaleUtilsImpl so a default locale can be set from the OSGI console.
Merge branch 'master' of git://github.com/sakaiproject/nakamura

* 'master' of git://github.com/sakaiproject/nakamura: (27 commits)
  KERN-3089 added unit test coverage for PROP_BARE_AUTHORIZABLE
  KERN-3089 Added a set if unit tests to help ensure we do not regress in this area again. Thanks, L
  KERN-3089 undo Zach's code cleanup - we depend on this stuff - please do not remove. commit a8a69078a6bc37529658597e455776bee8bc5e88 Author: Zach A. Thomas <zach@aeroplanesoftware.com> Date:   Fri Aug 3 13:35:17 2012 -0500
  KERN-3085 Followup - fix formatting
  KERN-3085 followup - fix OSGi wiring to resolve intermittent test failure
  KERN-3109 Simplify o.s.n.util.PathUtils.lastElement with o.a.c.l.StringUtils.
  KERN-3089 use isDebugEnabled to prevent unnecessary processing.
  KERN-3070 resolve merge conflict and merge b2636db
  KERN-3074 Have ServletDocumentationRegistryImpl activate immediately to save circular thread check exception on delayed services in Felix. Export Servlet from DocumentationServlet to register it correctly. Catch exception and log intead of die when getting a service doesn't succeed.
  KERN-3089 add integration tests for user/impl and clean up unused code
  KERN-2880 resolved merge conflicts
  KERN-3070 Make the default log level ERROR
  SOLR-75 tweak the pom file so deployment works.
  SOLR-75 Use solr-example-resources JAR for faster Solr builds
  SOLR-75 Create solr-example-resources JAR for faster Solr builds
  KERN-3070 Cucumber integration tests to cover files/impl; document pooled content data model
  KERN-3085 Applying patch submitted by Carl to fix query syntax
  KERN-3075 Avoid triggering Tika text-parsing error from this integration test
  KERN-3052 Make User ID searches more precise
  KERN-3085 Use annotations to instantiate LiteFileSearchBatchResultProcessor so that all its dependencies will work
  ...
Merge pull request #961 from raydavis/KERN-3097

 Do not mix Jackrabbit & SparseMapContent tag storage
NOJIRA - Removed immediate=true from the LocaleUtilsImpl Component.
Merge pull request #972 from simong/master

NOJIRA - Added metatype = true to the LocaleUtilsImpl Component
KERN-3088 Upgrade felix bundles. Add package admin and obr web console plugins.
KERN-3102 Upgrade Apache Aries bundles.
KERN-3103 Upgrade to latest Sling logging setup. Upgrade slf4j to 1.6.6.
KERN-3112
LTI client needs to be able to support multiple VirtualToolDataProvider service bindings
(cherry picked from commit b13a7d87c8a12ee4309cdba07996b0330f9eee8d)

Conflicts:
	bundles/basiclti/src/main/java/org/sakaiproject/nakamura/basiclti/CLEVirtualToolDataProvider.java
KERN-3003 NPE fix in ldapauth, restauth, samlauth. Passing profile information to the DefaultPostProcessor rather than setting them ourselves on the authorizable.
KERN-3122 additional processing for htmlblock regions to prune out unwanted widget elements
KERN-3125 DocMigrator needs better error logging when unexpected things happen during content migration
KERN-2841 resolved merge conflict with 'git rebase master'
KERN-2841 resolved merge issues between commits 17d6ff2e592be3958e7e958e6cadbdef8233c82d and 83a2806c8a5745dfc9081bae28564602f4c3d45c
KERN-2841 added needed data to me feed

Conflicts:

	bundles/meservice/src/main/java/org/sakaiproject/nakamura/meservice/LiteMeServlet.java
	bundles/meservice/src/test/java/org/sakaiproject/nakamura/meservice/LiteMeServletTest.java

Conflicts:
	bundles/meservice/src/test/java/org/sakaiproject/nakamura/meservice/LiteMeServletTest.java
KERN-2841 added null check for counts
KERN-2814 implemented count for user collections and moved count logic to services with appropriate bundles

Conflicts:

	bundles/meservice/src/main/java/org/sakaiproject/nakamura/meservice/LiteMeServlet.java

Conflicts:
	bundles/meservice/src/main/java/org/sakaiproject/nakamura/meservice/LiteMeServlet.java
	bundles/meservice/src/test/java/org/sakaiproject/nakamura/meservice/LiteMeServletTest.java
KERN-2841 added comments/licenses

Conflicts:

	bundles/meservice/src/main/java/org/sakaiproject/nakamura/meservice/LiteMeServlet.java

Conflicts:
	bundles/meservice/src/main/java/org/sakaiproject/nakamura/meservice/LiteMeServlet.java
KERN-2841 renamed UnreadMessageCountService to MessageCountService to increase scope of its responsibility