merge r13819 to 8.09 Add hostapd-mini to default images where applicable