Merge "Set SureFire plugin version to make tests work"