Merge "More correctly close RA daemon socket." into nyc-mr1-dev