Merge BlueZ 5.20 into master

Change-Id: I2d69df1b233a4e0135fd5137bc792a7040897f2a