Add modified MetaDataClient.java that was omitted from last commit