Clean-up of the way that operator-specific templates are handled.
Clean-up of the way that operator-specific templates are handled.

drupaltr/html-query-plan,drupaltr/html-query-plan,JustinPealing/html-query-plan,JustinPealing/html-query-plan,nickivanov/html-query-plan,coldhawaiian/html-query-plan