[nwam-dev] fix mismerge, no config/ipf_config_file property

[anurag.mas...@sun.com]

Author: Anurag S. Maskey <Anurag.Maskey at Sun.COM>
Repository: /hg/nwam/nwam1
Latest revision: f59993d7b7872961f4383f9cc1134a486d270afc
Total changesets: 1
Log message:
fix mismerge, no config/ipf_config_file property

Files:
        update: usr/src/cmd/ipf/svc/ipfilter
        update: usr/src/cmd/ipf/svc/ipfilter.xml
        update: usr/src/cmd/svc/shell/ipf_include.sh