Merge "CORD-3025: changing project-type to maven for aaa-gerrit"