Fixed incorrect usage of uuid
Missed the RPM/SRPM ID in the move to uuid
Merge remote branch 'upstream/jdob-v1-upgrade' into jdob-v1-upgrade