Point pom.xml to correct location for git properties file
VariantUploader adds in frequency information by default
Fix merge conflicts in VariantUploader