Hi wireguy,
this is a revert (somehow). There were some conflicts, so I've copied together this changeset in a new JOSM layer.

Sorry for losing the sidewalks; I've tried to restore them with changeset/112076750