FLUID-5474: No longer removing tocTemplate option (1.5.x branch)

Preserving the tocTemplate options after a distribute options call. Added a unit test. This is for the 1.5.x branch.

http://issues.fluidproject.org/browse/FLUID-5474