Freetext import tool enhancement

- mass edit types where applicable
- ip-src/ip-dst type will create two attributes, one for each
Merge branch 'hotfix-2.3.35' into develop