Merge "Add new snapuserd socket and property rules."