Merge "Update lispflowmapping options in custom.properties"