reverse-merged from commit 622b3232c54f132c09819906fb4ea29e8d995d35. aggregate progress moved to sparql1.1 branch.
Revert "reverse-merged from commit 622b3232c54f132c09819906fb4ea29e8d995d35. aggregate progress moved to sparql1.1 branch."

This reverts commit 301df3ee5734d55c3ba59c9ae02361098826fb90.
Merge branch 'origin/sparql1.1'