Merge from Perforce
Fix the script issues in the LLDP test cases
Fix the script issues in the configuration ap zone test cases