shouldn't have commented out the first and third sections
shouldn't have commented out the first and third sections

git-svn-id: 03d7800a49d8905ef4fbcc296184319e19243493@1131696 13f79535-47bb-0310-9956-ffa450edef68

Gilbert88/mesos,chhsia0/mesos,pwendell/mesos,Gilbert88/mesos,charlescearl/VirtualMesos,reneploetz/mesos,Aman-Jain-14/customizedMesos,reneploetz/mesos,abudnik/mesos,enachb/mesos,Aman-Jain-14/customizedMesos,jpeach/mesos,gsantovena/mesos,charlescearl/VirtualMesos,wickman/mesos,enachb/mesos,Gilbert88/mesos,reneploetz/mesos,yuquanshan/customizedMesos,woggle/mesos-old,chhsia0/mesos,wickman/mesos,charlescearl/VirtualMesos,asamerh4/mesos,verizonlabs/mesos,asamerh4/mesos,yuquanshan/customizedMesos,dforsyth/mesos,neilconway/mesos,Gilbert88/mesos,asamerh4/mesos,dforsyth/mesos,enachb/mesos,dforsyth/mesos,abudnik/mesos,abudnik/mesos,kaysoky/mesos,samwhitlock/mesos-monitoring,pwendell/mesos,gsantovena/mesos,yuquanshan/customizedMesos,gsantovena/mesos,craimbert/mesos,chhsia0/mesos,enachb/mesos,woggle/mesos-old,pwendell/mesos,Aman-Jain-14/customizedMesos,zmalik/mesos,charlescearl/VirtualMesos,wickman/mesos,gsantovena/mesos,woggle/mesos-old,andschwa/mesos,kaysoky/mesos,Aman-Jain-14/customizedMesos,pwendell/mesos,chhsia0/mesos,asamerh4/mesos,samwhitlock/mesos-monitoring,samwhitlock/mesos-monitoring,wickman/mesos,verizonlabs/mesos,andschwa/mesos,charlescearl/VirtualMesos,asamerh4/mesos,zmalik/mesos,abudnik/mesos,woggle/mesos-old,asamerh4/mesos,verizonlabs/mesos,Aman-Jain-14/customizedMesos,woggle/mesos-old,neilconway/mesos,charlescearl/VirtualMesos,neilconway/mesos,Gilbert88/mesos,reneploetz/mesos,craimbert/mesos,andschwa/mesos,samwhitlock/mesos-monitoring,pwendell/mesos,abudnik/mesos,yuquanshan/customizedMesos,craimbert/mesos,andschwa/mesos,gsantovena/mesos,wickman/mesos,zmalik/mesos,woggle/mesos-old,craimbert/mesos,Gilbert88/mesos,neilconway/mesos,neilconway/mesos,jpeach/mesos,yuquanshan/customizedMesos,gsantovena/mesos,woggle/mesos-old,verizonlabs/mesos,charlescearl/VirtualMesos,gsantovena/mesos,chhsia0/mesos,craimbert/mesos,samwhitlock/mesos-monitoring,zmalik/mesos,verizonlabs/mesos,charlescearl/VirtualMesos,asamerh4/mesos,verizonlabs/mesos,dforsyth/mesos,reneploetz/mesos,chhsia0/mesos,jpeach/mesos,Aman-Jain-14/customizedMesos,andschwa/mesos,craimbert/mesos,kaysoky/mesos,reneploetz/mesos,woggle/mesos-old,reneploetz/mesos,craimbert/mesos,kaysoky/mesos,pwendell/mesos,wickman/mesos,neilconway/mesos,abudnik/mesos,kaysoky/mesos,neilconway/mesos,andschwa/mesos,enachb/mesos,jpeach/mesos,Gilbert88/mesos,pwendell/mesos,jpeach/mesos,jpeach/mesos,Aman-Jain-14/customizedMesos,yuquanshan/customizedMesos,jpeach/mesos,chhsia0/mesos,zmalik/mesos,wickman/mesos,dforsyth/mesos,zmalik/mesos,enachb/mesos,dforsyth/mesos,enachb/mesos,andschwa/mesos,woggle/mesos-old,pwendell/mesos,yuquanshan/customizedMesos,kaysoky/mesos,charlescearl/VirtualMesos,verizonlabs/mesos,samwhitlock/mesos-monitoring,zmalik/mesos,abudnik/mesos,kaysoky/mesos,dforsyth/mesos,pwendell/mesos