Fix merge issues.
Merge pull request #8 from bondar-pavel/bp/infoblox-plugin-neutron

Fix issues that were missed during merge