Fix test failure due to merge
Fix test failure due to merge

devpaul/boulder,modulexcite/boulder,ZCloud-Firstserver/boulder,lucasallan/boulder,deserted/boulder,jfrazelle/boulder,patf/boulder,mozmark/boulder,jcjones/boulder,josephyzhou/boulder,bmw/boulder,KyleChamberlin/boulder,benileo/boulder,hlandauf/boulder,ibukanov/boulder,lmcro/boulder,mozmark/boulder,modulexcite/boulder,postfix/boulder,deserted/boulder,devpaul/boulder,mommel/boulder,bmw/boulder,postfix/boulder,deserted/boulder,benileo/boulder,lmcro/boulder,josephyzhou/boulder,jfrazelle/boulder,patf/boulder,kuba/boulder,ibukanov/boulder,julienschmidt/boulder,julienschmidt/boulder,benileo/boulder,lucasallan/boulder,r0ro/boulder,sophie-h/boulder,sophie-h/boulder,postfix/boulder,KyleChamberlin/boulder,devpaul/boulder,KyleChamberlin/boulder,jsha/boulder,modulexcite/boulder,jfrazelle/boulder,mommel/boulder,kuba/boulder,jcjones/boulder,modulexcite/boulder,mehmooda/boulder,ZCloud-Firstserver/boulder,jmhodges/boulder,mommel/boulder,mozmark/boulder,postfix/boulder,jsha/boulder,josephyzhou/boulder,jsha/boulder,patf/boulder,lmcro/boulder,mehmooda/boulder,mehmooda/boulder,r0ro/boulder,ZCloud-Firstserver/boulder,kuba/boulder,letsencrypt/boulder,letsencrypt/boulder,lucasallan/boulder,jcjones/boulder,jfrazelle/boulder,jcjones/boulder,mehmooda/boulder,letsencrypt/boulder,jmhodges/boulder,KyleChamberlin/boulder,hlandauf/boulder,patf/boulder,benileo/boulder,julienschmidt/boulder,hlandauf/boulder,sophie-h/boulder,r0ro/boulder,ZCloud-Firstserver/boulder,devpaul/boulder,kuba/boulder,jmhodges/boulder,jmhodges/boulder,r0ro/boulder,ibukanov/boulder,bmw/boulder,deserted/boulder,mommel/boulder,hlandauf/boulder,josephyzhou/boulder,lmcro/boulder,julienschmidt/boulder,mozmark/boulder