CB-7383 Bump version to 3.6.1