BUG: Filter was not passing parameters to sub filter.

Filter was not passing OriginalCellIdName and OriginalPointIdName
to the internal filter. Fixed.

Also fixed coding style problem.

Change-Id: I0bc7f7302209e97649ced6c132a8d95d71b0bb51
Merge topic 'datasetsurface-api-addition' into master

77f45a0b BUG: Filter was not passing parameters to sub filter.