Merge "Adds Undercloud retry and log fetch"