Fix merge conflicts during merge of next and the suricata branch

diff --cc config/rootfiles/common/aarch64/initscripts
Simple merge

diff --cc config/rootfiles/common/armv5tel/initscripts
Simple merge

diff --cc config/rootfiles/common/i586/initscripts
Simple merge

diff --cc config/rootfiles/common/x86_64/initscripts
Simple merge

diff --cc lfs/initscripts
Simple merge

diff --cc make.sh
Simple merge