#18 more shortcommit fixes
Merged by ryanabx. Opened by ryanabx.
fedora-cosmic/ ryanabx/cosmic-packaging main  into  main