Fix the script issues in the LLDP test cases
Merge from Perforce
Merge branch 'bug/b368'