WIP PDB-554 Switch us over to a maintenance branch for debugging the EC2 zombie instance problem

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