Adding a validation query to test on borrow, limited to once every 30 seconds so we don't over do it. This should also help avoid returning stale db connections
Correcting odd auto-formatting issue
Merge branch '1.5'