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