Merge "make autojoin associated scan period a config opttion" into lmp-dev