Fixed issue when adding a conflicted feature if no unstaged features existed.

Improved testing for conflict storage has been added
Upgrade BDB JE from 5.0.58 to 5.0.84
Fixed incorrect functional test
Merge branch 'master' of github.com:opengeo/GeoGit
Fixed incorrect functional test
Merge pull request #361 from volaya/master

Fixed incorrect functional test
Merge remote-tracking branch 'origin/pr/360'
Merge remote-tracking branch 'origin/pr/357'
Fix an apparently random test failure due to static initialization of a helper class.

The PG/SL/SQLServer/SHP export tests use a fake DataStoreFactory for the source data
that is being initialized once for all the tests cases and is causing some random
failures that are fixed if the helper class is initialized once per test case.