Fixed bugs preventing rpm from building.
Merge branch 'feature/package-as-rpm' into develop