KERN-2751 OAE-33 replaced context-type of CourseSection with course; and user role of Learner with Student
(cherry picked from commit 7662fbc0ca8f5ab4e8867db94379b212c049c155)

Conflicts:

	bundles/basiclti/src/main/java/org/sakaiproject/nakamura/basiclti/BasicLTIConsumerServlet.java
ACAD-826 Enable sakai.blogwow, sakai.sitestats, and sakai.sections by default in Sakai 2 Tools Widget
(cherry picked from commit d3a7b99cd3bd261c0cc2150348c42ee76f2f6cb1)

Signed-off-by: Lance Speelmon <lance@speelmon.com>
KERN-2720 Cover activity feeds with unit and integration tests, and enhance them with sakai:activity-audience handling

Squashed commit of the following:

commit 566dc7648276a15f229d717b49b5e19c71774080
Author: Chris Tweney <chris@media.berkeley.edu>
Date:   Mon Apr 9 14:28:50 2012 -0700

    KERN-2720 Move try block so that private profiles don't cause the whole feed to be empty

commit 6b2d8af089e73386081ccb5e7fbbde9c6f94ba2c
Author: Chris Tweney <chris@media.berkeley.edu>
Date:   Mon Apr 9 14:04:05 2012 -0700

    KERN-2720 Add feed of actor and audience to activities feeds

commit f48611fce698d81ee286d56076332079fcd0f1f8
Author: Chris Tweney <chris@media.berkeley.edu>
Date:   Thu Apr 5 11:01:54 2012 -0700

    KERN-2720 Pass the sakai:activity-audience param through LiteActivityCreateServlet

commit 7924ca7a6bf0e62f61aa3267e5194733375ab840
Author: Chris Tweney <chris@media.berkeley.edu>
Date:   Thu Apr 5 09:51:13 2012 -0700

    KERN-2720 Fix typo in param name

commit 91b4407e9b89ce4bf47f96f24b78679be12f3464
Author: Chris Tweney <chris@media.berkeley.edu>
Date:   Wed Apr 4 16:03:42 2012 -0700

    KERN-2720 Write unit tests to cover ActivityServiceImpl
KERN-2698 Improve speed of large message count searches
Reduce scope of basic query and remove most populated key.
Use Solr 4 grouping to eliminate Content loop.
Replace invalid condition in unit test.
Have Me servlet and Message Count servlet use the same query.
KERN-2763 and KERN-2765 Unit tests to demonstrate how corrupt sakaidocs get migrated
KERN-2763 Sparse upgrader to fix sakai docs with 'undefined' nodes
KERN-2763 Partial implementation of the undefined node fixer
KERN-2763 Finish impl of undefined-node fixer
Unit tests no longer needed, so Revert "KERN-2763 and KERN-2765 Unit tests to demonstrate how corrupt sakaidocs get migrated"

This reverts commit ec906f6ee446afb4a0e3848e6350db97e782eed8.
KERN-2763 Move structure0 to files API
Merge pull request #740 from ctweney/kern-2763

Kern 2763
KERN-2737: Updating content viewers errors for someone in the editor role
KERN-2771 Creating a special operation for publishing sakaidoc pages: SakaiDocPagePublishOperation.

This was created to overcome issues with replacing sakai messages when page is published. This Operation will maintain a history of sakai/message nodes that existed prior to the draft being published, and be overlaid onto the final content after the draft has been published.
KERN-2777 Provide the ability to granularly "@Ignore"

This change allows UI devs to specify @Ignore as a key suffix in a JSON import that instructs the server to completely ignore that tree of content. No content below that node (including the node itself) should be updated or deleted.

An example import of content can be:

{
  "id3973361": {
    "comments": {
      "message": {
        "sling:resourceType": "sakai/messagestore",
        "_created": 1334613157826,
        "_id": "e1pKIIgOEeG4WfQRwKgBAw+",
        "_lastModifiedBy": "admin",
        "_lastModified": 1334613157859,
        "_createdBy": "admin",
        "_path": "l6yabccQGq/id9487514/id3973361/comments/message",
        "inbox@Ignore": true
      }
    }
  }
}

Where everything below id3973361/comments/message/inbox, including 'inbox' itself will not be modified or deleted. Note that the following are considered equivalent:

"inbox@Ignore": true
"inbox@Ignore": {}
"inbox@Ignore": []

As the value of the content is not important below this point.
Merge pull request #745 from mrvisser/kern-2771

 Creating a special operation for publishing sakaidoc pages
Merge pull request #746 from mrvisser/kern-2777

 Provide the ability to granularly "@Ignore"
KERN-2665 Revise servlet doc index so it is a more useful tabular layout
KERN-2665 Redesign doc servlet page so servlets, searches, and proxies all list on the same page, and look much prettier to boot.
KERN-2781 update sparse and solr dependencies to 1.3.4 and 1.4.2
Merge pull request #749 from ctweney/kern-2665