Merge "Puppet: Configure neutron_api_class on controller"