Upgrade SHDP 2.0.0.RC4, tidy up