Merge "Reference driver implementation (IPsec) for VPNaaS"

diff --cc neutron/db/vpn/vpn_db.py
Simple merge

diff --cc neutron/extensions/vpnaas.py
Simple merge

diff --cc neutron/tests/unit/nicira/test_nicira_plugin.py
Simple merge

diff --cc neutron/tests/unit/test_l3_plugin.py
Simple merge

diff --cc setup.cfg
Simple merge