Merge "More cleanup/refactoring of neutron client"