- Backported JGRP-1875 from master
- Changed version to 3.5.1.Final