Fix the manifest to allow optional installation.

Underlying Neutron puppet is still in flux as to what it installs for us, so try
to cover all cases for now.
Merge pull request #136 from jguiditta/ml2-fixes

Fix the manifest to allow optional installation.