Merge branch 'cps_poc' of /home/jwagantall/linuxfoundation/onap/IT-20983/origin