Merge from Perforce
Add the test cases of creating batch zones with L2GRE and L3GRE QinQ WLANs