Merge branch 'hotfix/1.5.4'
Fixes to spec file.
Merge branch 'master' of https://github.com/lwandrebeck/rozofs into lwandrebeck-develop
Merge branch 'lwandrebeck-develop' into develop