remove trailing whitespace

Signed-off-by: Gregory Amerson <gregory.amerson@liferay.com>
added missing template processing

Signed-off-by: Gregory Amerson <gregory.amerson@liferay.com>