Merge "RESTConf java upgrade"