update version from 3.5 to trunk-snapshot