COMP: Default template arguments cannot be used with function

Need to use function overloading to support optional or default
template arguments to a function.

Change-Id: Iabc741b5b59436a8ffbea93d5d779748f7e1c089
Merge topic 'AddDisplacementFieldTransform' into next

2c26a804 COMP: Default template arguments cannot be used with function