Moved the setting of estimator to exist for all cases with energyout filters.
Moved the setting of estimator to exist for all cases with energyout filters.

Conflicts:
	src/input_xml.F90

wbinventor/openmc,liangjg/openmc,johnnyliu27/openmc,johnnyliu27/openmc,shenqicang/openmc,nhorelik/openmc,liangjg/openmc,amandalund/openmc,samuelshaner/openmc,mit-crpg/openmc,mit-crpg/openmc,walshjon/openmc,shikhar413/openmc,mjlong/openmc,shikhar413/openmc,kellyrowland/openmc,lilulu/openmc,wbinventor/openmc,kellyrowland/openmc,amandalund/openmc,amandalund/openmc,wbinventor/openmc,walshjon/openmc,shikhar413/openmc,walshjon/openmc,johnnyliu27/openmc,johnnyliu27/openmc,shikhar413/openmc,sxds/opemmc,liangjg/openmc,samuelshaner/openmc,wbinventor/openmc,bhermanmit/openmc,smharper/openmc,mit-crpg/openmc,shenqicang/openmc,liangjg/openmc,lilulu/openmc,bhermanmit/cdash,mjlong/openmc,paulromano/openmc,lilulu/openmc,nhorelik/openmc,smharper/openmc,walshjon/openmc,paulromano/openmc,amandalund/openmc,paulromano/openmc,sxds/opemmc,mit-crpg/openmc,smharper/openmc,samuelshaner/openmc,paulromano/openmc,bhermanmit/openmc,samuelshaner/openmc,smharper/openmc