Merge "NFVO Resource Manager pages"