Merge pull request #769 from kbarber/ticket/1.5.x/PDB-119-java-ec-cipher-issues

WIP: PDB-119 Pin to RSA ciphers for all jdk's to work-around Centos 6 EC failures
Merge pull request #767 from kbarber/maint/1.5.x/use-latest-beaker

This patch allows us to use the latest 1.x version of beaker
Merge branch '1.5.x'

* 1.5.x:
  PDB-119 Pin to RSA ciphers for all jdk's to work-around Centos 6 EC failures
  Use the latest 1.x version of beaker

Conflicts:
	src/com/puppetlabs/jetty.clj
	test/com/puppetlabs/test/jetty.clj
Add migration

Signed-off-by: Ken Barber <ken@bob.sh>
fix some burgs

Signed-off-by: Ken Barber <ken@bob.sh>
comment out some tests for review later

Signed-off-by: Ken Barber <ken@bob.sh>
Tests for edge replacement

Signed-off-by: Ken Barber <ken@bob.sh>
Get tests to pass

Signed-off-by: Ken Barber <ken@bob.sh>
more test cleanup

Signed-off-by: Ken Barber <ken@bob.sh>
Fix sql query with proper certname matching

Signed-off-by: Ken Barber <ken@bob.sh>
fix edges query

Signed-off-by: Ken Barber <ken@bob.sh>
Drop update comparisons for edges

Signed-off-by: Ken Barber <ken@bob.sh>
Do nothing when edges nil

Signed-off-by: Ken Barber <ken@bob.sh>
Add coverage for empty edge insert/deletes

Signed-off-by: Ken Barber <ken@bob.sh>
Improve api docs and comments for insert/delete edges

Signed-off-by: Ken Barber <ken@bob.sh>
Catch sqlexception during transactions and unravel with getNextException

Signed-off-by: Ken Barber <ken@bob.sh>
Add tests for concurrency

Signed-off-by: Ken Barber <ken@bob.sh>
To avoid transactions staying open and causing 'transaction can't be changed' errors

Signed-off-by: Ken Barber <ken@bob.sh>
Fix tests so they pass

Signed-off-by: Ken Barber <ken@bob.sh>