DLPX-94537 fix cloud-init merge conflict#113

sebroy merged 2 commits intodevelopdelphix/cloud-init:developfrom

dlpx/pr/sebroy/f4d3d45f-d61b-4f3e-896a-522b7af3e9fadelphix/cloud-init:dlpx/pr/sebroy/f4d3d45f-d61b-4f3e-896a-522b7af3e9faCopy head branch name to clipboard