Merge from Perforce
Add the restoration mechanism in the UTP test suite
Modify the time of waiting for AP's update to 12 minutes in the Band Balancing test suite