According to the wiki track and roads are supposed to be separate ways. This isn't what I did, so I'm reverting the two changesets you mentioned (152609354;152609305). If you have others mention them and i'll revert them too.
https://www.openstreetmap.org/changeset/152931823