Bug 964842 - Merge test_bluetooth_discoverable and test_settings_bluetoo...

...th.py