Upgraded surefire plugin to 2.16.  AMQ-5006
Bumped up test timeouts because of CI failures, also cleaned up imports