Merge pull request #26 from ravitejagettam/test-m1-build

modified status check based on enabled_services in task.sh,made sanity.s...
This change conforms the script to the new packaging/process-mgmt
scheme where supervisor instances for each node manages individual
contrail services such contrail-collector, contrail-config etc.

That is why while shutting down the services, we need to shut down
supervisor instances too.

Closes-PR: 1354579
Merge pull request #28 from Juniper/chandan_bug

This change conforms the script to the new packaging/process-mgmt
modifications in setup_devstack.sh based on the current contrail setup