DDF-579  changed to use StringUtils
DDF-579  removed commented out code referencing obsolete notificationStore
DDF-605  removed commented out code using workspaceMap