Merge "[2/n] FRR data persistence" into udc-qpr-dev