Merge "Fix bug #2569 XSQL delay controller load when in cluster env"