add httpport in jetfire.conf
add httpport in jetfire.conf
fix merge