Merge "[DCAE] Policy-handler version revision for bugfix"