Merge "Remove ptp from persist config on boot" into oc-dev