Refactoring. Isolated rpm building from the rest of the DistMojo
Merge remote-tracking branch 'origin/master'