BZ-0000: Removing trailing whitespace.
Merge branch 'estimate-word-templates' into integration