Revert "Revert "Avoid double memory free and crash during LE discovery or disconnect""

The revert includes a compilation fix as well
(missing include of a header file).

This reverts commit 807f359f.

Change-Id: I5bb1f468d2c64839037afe5ed2d3ed5d1b21dca2