Merge "Typo fix for baremetal parameters in neutron client"