Merge "Fixes delorean repo update on undercloud" into stable/fraser