various changes to get merge conflict
Merge branch 'master' of https://github.com/vertica-as/Rapunzel