Prepared 2.4 branch
Merge branch '2.4'
Added demos to main build
Merge branch '2.4'
More pom updates for 2.4
Merge branch '2.4'