Don't use invalid smokestack branch for ceilometer

I accidently left this branch switch in when moving back to upstream