Merge from Perforce
Update
Fix the script issue in the LLDP test suite