Removing an optional -SNAPSHOT
Merge branch 'refs/heads/f/rpm'