Merge "Increase RESTRICTED bucket timeout to 30 days." into rvc-dev