Wrapper changed to 2.2.1
Now using correct way to perform startup scanning
Replacing our extension finder with Apache Commons IO
Merge remote-tracking branch 'origin/master'