Fix the issues for serve-merchant-web which didn't upgrade to the latest galaxy-client gem