Correct NVP plugin path for folsom to grizzly migration

Fixes bug 1180089

Change-Id: Ic79cd28971c276a93085c086d73ee7f6de99f5f7
make default transport type configurable nvp

Fixes bug 1179759

Conflicts:

	etc/quantum/plugins/nicira/nvp.ini
	quantum/plugins/nicira/common/config.py
	quantum/tests/unit/nicira/test_nvpopts.py

Change-Id: I8f644f2bc0d5d144f52e5ed0bd2e991503581ad2
Merge "make default transport type configurable nvp" into stable/grizzly
Merge "Correct NVP plugin path for folsom to grizzly migration" into stable/grizzly