Some Master cleanups.
Some Master cleanups.

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

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