Merge branch 'rcu-tasks.2014.08.27a' into HEAD

Separate merge of rcu-tasks due limitations of octopus merge in the
presence of conflicts.