Merge branch 'unit-test-jdk7' of https://github.com/rankinc/btm into unit-test-jdk7
Fix references to XA states in comments, and remove unused import.
More final variables and @Override annotations.
Added Jetty 9 Lifecycle support
Fixed whitespace
Merge commit 'f01f63fda8a6e4579f4d874e605094ad99034137' into tidy-up-jdk6
Merge commit '7811d323a6ee61fabf9dcf2a30359b7556620e86' into tidy-up-jdk6
Add generic types to List and Iterator.
Merge pull request #30 from rankinc/tidy-up-jdk6

Tidy up jdk6.  Reviewed.
Merge pull request #23 from yuppyavd/master

Support for Jetty 9 Lifecycle.  Reviewed.
Merge remote-tracking branch 'base-btm/master'