Configuration includes - v2.

Get rid of the one line if statements.

https://buildbot.suricata-ids.org/builders/jasonish/builds/35