Merge "Add code to follow ONAP API CVS guidelines"