Merge pull request #3916 from phire/totallyAwesomeBranch analytics: Collect less data about controllers.
