Merge branch 'feature/nvs_version_check' into 'master'

nvs_flash: Version compatibility check for nvs storage

See merge request idf/esp-idf!2855

diff --cc examples/bluetooth/gatt_security_server/main/example_ble_sec_gatts_demo.c
Simple merge