Merge "Avoid pointless DB_MASTER connections in User::clearSharedCache()"