Fixed incorrect substitution
Added ISOs step to filesystem upgrade
Fixed incorrect usage of uuid
Merge remote-tracking branch 'upstream/jdob-v1-upgrade' into jdob-v1-upgrade