sync with OpenESPI-Common-java/etc