Pull in Sufia change to IdService locking (for Jenkins)