Rebase and apply patches for RPM build.

Original sources:
* https://github.com/dmi-try/marionette-collective/commit/9f8d2ec75ba326d2a37884224698f3f96ff01629
* https://github.com/dmi-try/marionette-collective/commit/ed9ac1ceef38ef00db78666c0fa9b30f44a36ef3