Merge "Update maven support lib version for KLP." into klp-dev