Merge from Perforce
Modify the test cases of creating/cloning/deleting wlan template
Modify the checking mechanism in applying WLAN template to a specific zone