Merge "Configure BTA DM to not force master role upon inquiry" into klp-dev