Merge from Perforce
Set AP time intveral while waiting for up-to date
Don't check the redundancy configuration while restoration