Merge "Move mcp.rsa to /var/lib/opnfv"