Fixes for new DataModel package location


git-svn-id: svn+ssh://svn.cern.ch/reps/atlasoff/Control/StoreGate/branches/StoreGate-02-39-08-branch@561591 4525493e-7705-40b1-a816-d608a930855b
more fixes to remove DataModel


git-svn-id: svn+ssh://svn.cern.ch/reps/atlasoff/Control/StoreGate/branches/StoreGate-02-39-08-branch@561594 4525493e-7705-40b1-a816-d608a930855b