CP-4460: substitute trunk-specific elements with the clearwater equivale...

...nts

Unfortunately the original pull request duplicated from trunk contains some trunk specific elements which are non-exist in clearwater. This changeset should fix it.

Signed-off-by: Zheng Li <zheng.li@eu.citrix.com>