Fix mcollective service
Fix location of oo-admin-cartridge based cartridge installation
Fixing vagrant startup.
Enable openshift-tc service for traffic control
Updating module version to 0.1.14
fix merge conflict