This continues into 1.12.
This is also happening in 1.12.0One (temporary) solution I found was to allow the villagers to wander until they find "their" workstation, then lock them back in.
This continues into 1.12.