Remove controlID inclusion from mustache
Merge pull request #4269 from marcioj/old_control_helper_stuff

Remove controlID inclusion from mustache