Merge branch 'nimble/fix_ble_hs_reset_v4.0' into 'release/v4.0'

NimBLE: Reset master and slave states on host reset and fix build failure (backport v4.0)

See merge request espressif/esp-idf!8218
This commit is contained in:
Jiang Jiang Jian
2020-04-15 13:26:18 +08:00