Update MetaStoreClient for mstool.sh and change Makefiles