Merge "Fix deployment errors in nbi cloud init"