Merge changes I9751454d,I4b962ef3 into msm-3.0

* changes:
  Bluetooth: Fix l2cap conn failures for ssp devices
  Bluetooth: Fix L2CAP connection establishment