Merge "Mention odlparent in project lifecycle"