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
Merge pull request #962 from thecarlhall/kern-3088

KERN-3088, KERN-3012, KERN-3013
KERN-3125 DocMigrator needs better error logging when unexpected things happen during content migration
Merge pull request #979 from lancespeelmon/master

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
KERN-2841 refactored Count services for better code reuse versus LiteCountServlet and auth-all.json query reuse; resolved merge conflicts

Conflicts:
	bundles/files/impl/src/main/java/org/sakaiproject/nakamura/files/search/MeManagerViewerSearchPropertyProvider.java
	bundles/files/impl/src/main/resources/SLING-INF/content/var/search/pool/auth-all.json
KERN-2880 resolved changes brought about by shift to QueryHandler search model and created new endpoint for new Me Feed during development
KERN-2841 moved me service endpoint to /api/people/me; corrected Service registration regressions caused by KERN-2880
Merge pull request #969 from lancespeelmon/KERN-3112

KERN-3112
Merge remote-tracking branch 'duffy/KERN-2841' into kern-2841

* duffy/KERN-2841:
  KERN-2841 moved me service endpoint to /api/people/me; corrected Service registration regressions caused by KERN-2880
  KERN-2880 resolved changes brought about by shift to QueryHandler search model and created new endpoint for new Me Feed during development
  KERN-2841 refactored Count services for better code reuse versus LiteCountServlet and auth-all.json query reuse; resolved merge conflicts
  KERN-2841 renamed UnreadMessageCountService to MessageCountService to increase scope of its responsibility
  KERN-2841 added comments/licenses
  KERN-2814 implemented count for user collections and moved count logic to services with appropriate bundles
  KERN-2841 added null check for counts
  KERN-2841 added needed data to me feed
  KERN-2841 resolved merge issues between commits 17d6ff2e592be3958e7e958e6cadbdef8233c82d and 83a2806c8a5745dfc9081bae28564602f4c3d45c
  KERN-2841 resolved merge conflict with 'git rebase master'
KERN-2841 remove code that references obsolete UserConstants
KERN-3113 Look for user id in url and from remote user.