Set version number for 0.8.4 release.
Set snapshot version on master branch.

Changing to the Shibboleth project convention of maintaining -SNAPSHOT
within the main branch, and setting it only in release branches.
Use TestNG, not junit.
Correct assert argument ordering.
Merge remote-tracking branch 'origin/master' into 0.9pre