Update and re-enable the test_settings_cell_data
Remove logic in test_settings_cell_data due to more robust test setUp
Merge remote-tracking branch 'upstream/master' into fix_settings_cell_data
Remove failing script step and reinstate logic to handle the dc-warning box
Merge remote-tracking branch 'upstream/master' into fix_settings_cell_data

Conflicts:
	gaiatest/tests/settings/manifest.ini
Merge remote-tracking branch 'upstream/master' into fix_settings_cell_data

Conflicts:
	gaiatest/tests/settings/manifest.ini
Merge pull request #513 from zacc/fix_settings_cell_data

Update and re-enable the test_settings_cell_data