Added carrier tag to default manifest file for cost control

Conflicts:

	gaiatest/tests/cost_control/manifest.ini
Merge remote-tracking branch 'upstream/master'