Merge branch 'bugfix/fix_a_wpa_wpa2_bug_v2.1' into 'release/v2.1'

Fix a wpa and wpa2 bug

See merge request !1343
This commit is contained in:
Jiang Jiang Jian
2017-10-11 16:50:53 +08:00