Merge "Migrate to 18.04 clamp nodes"