Merge "align dockerdata, dockerdata-nfs for dev.yaml"