Squashed commit of the following:

commit 964449dd3d0f8aaa11515beb89711118bc8a2cce
Author: Ariel Weisberg <aweisberg@voltdb.com>
Date:   Mon Aug 18 17:50:17 2014 -0400

    Fix compilation in OS X... AGAIN

commit a82218b9b240f30d05da9dd0f8aea5a4a3341229
Author: Ariel Weisberg <aweisberg@voltdb.com>
Date:   Mon Aug 18 13:06:36 2014 -0400

    For fix OS X unused warning

commit a0e157b6c6be7e8c4525895a67e9a430a4fb97d5
Merge: a13e71d 508e1c8
Author: Ariel Weisberg <aweisberg@voltdb.com>
Date:   Fri Aug 15 17:57:44 2014 -0400

    Merge branch 'ENG-6702' of github.com:VoltDB/voltdb into PersistentDrLogMerge

    Conflicts:
    	src/ee/common/StreamBlock.h
    	src/ee/storage/DRTupleStream.cpp
    	src/ee/storage/DRTupleStream.h
    	src/ee/storage/TupleStreamBase.cpp
    	tests/ee/storage/DRTupleStream_test.cpp
    	tests/ee/storage/table_and_indexes_test.cpp

commit 508e1c8cc5d66aa2f9b1181948dfc539b282b25c
Author: Ariel Weisberg <aweisberg@voltdb.com>
Date:   Thu Aug 14 13:27:34 2014 -0400

    For ENG-6702, very important ti include the unique id when serializing...

commit c93556d76ff7180bebeb03355d8b843057b8cf45
Author: Ariel Weisberg <aweisberg@voltdb.com>
Date:   Thu Aug 14 13:16:12 2014 -0400

    For ENG-6702, fix unused warning on OS X

commit 9f6a277546c2d3f2649e6f79b759450d258ea78a
Author: Ariel Weisberg <aweisberg@voltdb.com>
Date:   Thu Aug 14 13:12:24 2014 -0400

    For ENG-6702, add more debugging to figure out Jenkin's only failure

commit e19c3edc0b14e33159e13d6022c2601fbe704fe3
Author: Ariel Weisberg <aweisberg@voltdb.com>
Date:   Thu Aug 14 12:24:28 2014 -0400

    For ENG-6702, fix failure in the memcheck build

commit cddd00855e75ebff403287a127f78843d49ebed1
Author: Ariel Weisberg <aweisberg@voltdb.com>
Date:   Thu Aug 14 11:55:48 2014 -0400

    For ENG-6702, fix test issues caused by new assertions

commit 0eba79d8752c7ec0993428ede066db007862a23a
Author: Ariel Weisberg <aweisberg@voltdb.com>
Date:   Wed Aug 13 18:12:45 2014 -0400

    For ENG-6702, inch closer to having working unique ids for DR2

commit 3696a0d1f8d77842c16f8420b6f94ae65d5a01a4
Author: Ariel Weisberg <aweisberg@voltdb.com>
Date:   Wed Aug 13 10:48:35 2014 -0400

    For ENG-6702, persist partition specific unique ids in snapshots and propagate for DR

commit 41f2aa07551bc73a65d81c41a6a94f00712de4b7
Author: Ariel Weisberg <aweisberg@voltdb.com>
Date:   Tue Aug 12 16:37:39 2014 -0400

    For ENG-6702, it works a lot better if you actually propagate the new unique IDs in DR. Default arguments == evil

commit 6433b109ddef8112262fe4066f6acc5a5632b807
Author: Ariel Weisberg <aweisberg@voltdb.com>
Date:   Tue Aug 12 14:46:25 2014 -0400

    For ENG-6702, yet more argument order mixups

commit b781ffecab34482459f3987418df82962c2e6697
Author: Ariel Weisberg <aweisberg@voltdb.com>
Date:   Tue Aug 12 14:34:49 2014 -0400

    For ENG-6702, repair needs to track max seen spuniqueid separately from the MP one

commit 648ca782c892d83ce03eff2b663a24e4a17b764d
Author: Ariel Weisberg <aweisberg@voltdb.com>
Date:   Tue Aug 12 14:25:37 2014 -0400

    For ENG-6702, fix various argument passing mixups. Coercing integers to booleans can DIAF

commit decf8503dc1a97b520f311f9b48d4f7e0b7e6714
Author: Ariel Weisberg <aweisberg@voltdb.com>
Date:   Mon Aug 11 18:24:43 2014 -0400

    For ENG-6702, fix bug where value was not initialized correctly

commit fd9d9d01a43e1e6febf832449d74047f6eb5bc8c
Author: Ariel Weisberg <aweisberg@voltdb.com>
Date:   Mon Aug 11 16:46:54 2014 -0400

    For ENG-6702, fix various issues with promotion and unique ids and modify tests to validate the ID propagates

commit 1db9d51c9becfe46b84da4bed9d8d84844074994
Author: Ariel Weisberg <aweisberg@voltdb.com>
Date:   Mon Aug 11 15:53:54 2014 -0400

    For ENG-6702, fix bug preventing promotion from working due to wrong partition id in unique id

commit 5761a4dbcb02084fdcc762d001a27efc51ad9f84
Author: Ariel Weisberg <aweisberg@voltdb.com>
Date:   Mon Aug 11 14:52:50 2014 -0400

    For ENG-6702, first stab at adding a separate single partition unique id for DR2

commit 57a8cc20930d58b5d9b75935975090b6d2124770
Author: Ariel Weisberg <aweisberg@voltdb.com>
Date:   Thu Aug 7 11:14:31 2014 -0400

    For ENG-6702, fix method signature

commit fd3f8d8d649dc3241dfbb6ef4017f48b0babe792
Author: Ariel Weisberg <aweisberg@voltdb.com>
Date:   Wed Aug 6 18:04:37 2014 -0400

    For ENG-6702, mark up InvocationBuffers using unique ids