Merge from Perforce
1. Wait for AP's updating configurations after setting LLDP parameter on GUI.
2. Disconnect AP from SCG while running the test case of rebooting AP.
Merge from Perforce
Solve the conflict