(PE-39351) Update add_database plan to work with patching/HAC#531

ragingra merged 3 commits intomainpuppetlabs/puppetlabs-peadm:mainfrom

PE39351puppetlabs/puppetlabs-peadm:PE39351Copy head branch name to clipboard