Merge pull request #244 from apache/refactoring/No-issue-bump-version

No issue: Set version to 3.6.0-SNAPSHOT