Squashed commit of the following:

commit dcd0c9099e252109525fe719646b27ee99e6b2ce
Merge: 7643528 d48c63c
Author: Alex Rogers <arogers@voltdb.com>
Date:   Thu Sep 11 16:56:49 2014 -0400

    Merge branch 'dr-integration-prime' into ENG-6829

commit 764352850cb52872d5aacdd98256b4279ea8aed3
Author: Alex Rogers <arogers@voltdb.com>
Date:   Thu Sep 11 15:27:35 2014 -0400

    ENG-6829: Fix NPE in TestMpPromoteAlgo

commit db581eaff73236606cbf47c2c316e1f73c4e01b8
Author: Alex Rogers <arogers@voltdb.com>
Date:   Thu Sep 11 12:58:47 2014 -0400

    ENG-6829: Repair log consumes the end, not start, unique id for @ApplyBinaryLogSP

commit f1f18d40f98c6def7c4819283fa178468d840656
Author: Alex Rogers <arogers@voltdb.com>
Date:   Tue Sep 9 15:47:51 2014 -0400

    ENG-6829: Add tests for repair log changes

commit 4651f721cab0ead95caccc24e429ce28a5a74bfb
Author: Alex Rogers <arogers@voltdb.com>
Date:   Thu Sep 4 16:26:13 2014 -0400

    ENG-6829: Add original uniqueId for binary log invocations to the repair log