rollback previous changes from hpehl
Update to ballroom 2.1.5-SNAPSHOT
Fix BZ1159782, BZ1117364: mod cluster validation errors