Code review comment for lp:~vishvananda/nova/project-vpns

Attempt to merge into lp:nova failed due to conflicts:

deleting parent in nova/api/cloudpipe
unversioned parent in nova/api/cloudpipe
contents conflict in nova/api/cloudpipe/__init__.py
text conflict in nova/auth/manager.py
text conflict in nova/cloudpipe/pipelib.py
text conflict in nova/crypto.py
text conflict in nova/db/sqlalchemy/models.py