Clean up of mysql lines. Fixes for Cinder. Started tidying up Neutron (still broked a bit due to move to ML2).