Fixed version to 1.6.0-beta.24
Preparing next development version
Merge remote branch 'upstream/master' into 2.6

Conflicts:
	core/pom.xml
Merge branch 'upstream-sync' into 2.6
Merge branch '2.6' of github.com:abiquo/jclouds-chef into 2.6