Added separation between maven and rpm version number
Merge branch 'refs/heads/f/rpm'