Master detector cleanups.
Master detector cleanups.

Review: https://reviews.apache.org/r/23866

gsantovena/mesos,andschwa/mesos,Gilbert88/mesos,reneploetz/mesos,jpeach/mesos,verizonlabs/mesos,yuquanshan/customizedMesos,jpeach/mesos,dforsyth/mesos,andschwa/mesos,abudnik/mesos,andschwa/mesos,verizonlabs/mesos,Gilbert88/mesos,reneploetz/mesos,gsantovena/mesos,chhsia0/mesos,zmalik/mesos,Aman-Jain-14/customizedMesos,chhsia0/mesos,chhsia0/mesos,Aman-Jain-14/customizedMesos,andschwa/mesos,gsantovena/mesos,jpeach/mesos,neilconway/mesos,neilconway/mesos,yuquanshan/customizedMesos,asamerh4/mesos,gsantovena/mesos,zmalik/mesos,gsantovena/mesos,yuquanshan/customizedMesos,verizonlabs/mesos,andschwa/mesos,abudnik/mesos,yuquanshan/customizedMesos,abudnik/mesos,kaysoky/mesos,kaysoky/mesos,Aman-Jain-14/customizedMesos,verizonlabs/mesos,craimbert/mesos,dforsyth/mesos,andschwa/mesos,dforsyth/mesos,Aman-Jain-14/customizedMesos,abudnik/mesos,neilconway/mesos,kaysoky/mesos,neilconway/mesos,craimbert/mesos,Gilbert88/mesos,Aman-Jain-14/customizedMesos,chhsia0/mesos,yuquanshan/customizedMesos,Gilbert88/mesos,chhsia0/mesos,verizonlabs/mesos,jpeach/mesos,asamerh4/mesos,asamerh4/mesos,abudnik/mesos,yuquanshan/customizedMesos,dforsyth/mesos,zmalik/mesos,asamerh4/mesos,craimbert/mesos,gsantovena/mesos,dforsyth/mesos,yuquanshan/customizedMesos,zmalik/mesos,andschwa/mesos,asamerh4/mesos,asamerh4/mesos,jpeach/mesos,kaysoky/mesos,verizonlabs/mesos,Gilbert88/mesos,chhsia0/mesos,dforsyth/mesos,neilconway/mesos,dforsyth/mesos,gsantovena/mesos,abudnik/mesos,craimbert/mesos,reneploetz/mesos,craimbert/mesos,kaysoky/mesos,Gilbert88/mesos,verizonlabs/mesos,Gilbert88/mesos,jpeach/mesos,Aman-Jain-14/customizedMesos,kaysoky/mesos,zmalik/mesos,craimbert/mesos,zmalik/mesos,abudnik/mesos,Aman-Jain-14/customizedMesos,reneploetz/mesos,asamerh4/mesos,reneploetz/mesos,neilconway/mesos,neilconway/mesos,zmalik/mesos,chhsia0/mesos,reneploetz/mesos,craimbert/mesos,reneploetz/mesos,jpeach/mesos,kaysoky/mesos