Split rjil::neutron into a contrail and an ovs variant

We still use OVS in the undercloud (only for PXE, it's not in the
critical path of any network traffic)
Update tests related to neutron split
Merge pull request #266 from bodepd/decouple_neutron

Decouple neutron
Remove debug statement

to see how much it speeds things up :)
don't run puppet from userdata

the partial run is forcing us to not
really start installing packages until
we have consul configured. This is probably
costing us at least 5 minutes of build time.

I'm pretty sure this is an artifact of when
we were compile failing.