Fix issues when debugging beatrix tests
Bump versions
Merge remote-tracking branch 'origin/master' into leaner-build

Signed-off-by: Pierre-Alexandre Meyer <pierre@ning.com>

Conflicts:
	Jarfile