Merge "Add -Pignore-lispflowmapping-integrationtest"