DE19409: updated preference storage to account for workspace UUID to handle hacky scoping
Respond to John Feedback (p.o.)