Merge "Push policy adapter code (adapted from ECOMP)"