am 5e811150: Merge "make autojoin associated scan period a config opttion" into lmp-dev

* commit '5e811150b9d538d0e59a367d8d75a20d85a12549':
  make autojoin associated scan period a config opttion