Merge upstream and downstream specfiles at build time#158

pmtk merged 2 commits intomicroshift-io:mainmicroshift-io/microshift:mainfrom

pmtk:single-specfilepmtk/microshift-io:single-specfileCopy head branch name to clipboard