Return InsecureHandler from master.

Subsequent changes will make use of both
m.Handler and m.InsecureHandler for different ports.
Merge pull request #2201 from erictune/insecure_handler

Return InsecureHandler from master.