Merge "Standardizing ONAP Portal"