Merge remote-tracking branch 'upstream/master'
new example for rotating PSKs
Update wlc_protocol_guide.md
Update wlc_protocol_guide.md
resolving conflicts