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

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

Fixed incorrect functional test
Upgrade BDB JE from 5.0.58 to 5.0.84