CBD-1108:  move grommit dir

Change-Id: Id6c1f6d2e3eeaaa2aaf1a222f40c54be0cba1dfd
CBD-1108:  UNDO move grommit dir

Change-Id: I373b54d9f72a2b00abcae2a8e7f5acaf20d9c1b8