Added a useful combinator to FutureMatchers.
Fix the dreaded hang in startup bug.
Merge remote-tracking branch 'jdegoes/master'
Merge remote-tracking branch 'nuttycom/master'
Mark the servlet API as provided to avoid downstream pollution