Various fixes.
Minor fixes.
Merge branch 'master' of https://github.com/jjbunn/MultipathODL

Conflicts:
	opendaylight/multipath/src/main/java/org/opendaylight/controller/multipath/MultiPath.java