Fujitsu scanner integration
Merge commit '59bff042a54eb1ec16d924dd3652a5fadd367eaf' into 1.5.0-Dev
Ignoring jars inside project lib folders.
Correcting conflicts in file that got checked in by mistake.