git rid of generics warnings
Merge branch 'va-branch' of https://github.com/Apelon-VA/OTF-Versioning-Service.git into va-branch