Added proper adjustment of project version number in multiple places
Merge branch 'refs/heads/f/rpm'

Conflicts:
	docs/scripts/rpm/contents/etc/system.properties
	docs/scripts/rpm/rpm.sh
Removed unnecessary comment
Merge branch 'refs/heads/f/rpm'