XD-1756 Upgrading to SHDP 2.0 RC4, modifying configs to match new properties

Depends on XD-1748 so we should rebase this PR once PR #883 is merged