Merge "Defer loading site libraries until database opens" into stable-2.6