Resolve conflicts in xact.h, xactdesc.c, twophase.c, and partially in…

[RekGRpth]

1. Commit 3941eb6 in src/include/access/xact.h changed the include
   utils/datetime.h to datatype/timestamp.h, while earlier commit 8ae22d1
   had already added the include storage/dbdirnode.h in the same location.

2. Commit c55040c in src/include/access/xact.h added a new define
   XLOG_XACT_INVALIDATIONS, while earlier commit 8ae22d1 had already added
   the defines XLOG_XACT_DISTRIBUTED_COMMIT and
   XLOG_XACT_DISTRIBUTED_FORGET in the same location.

3. Commit c55040c added handling for the new XLOG_XACT_INVALIDATIONS
   define in the xact_desc and xact_identify functions in
   src/backend/access/rmgrdesc/xactdesc.c. Earlier commit 8ae22d1 had
   already added handling for the XLOG_XACT_DISTRIBUTED_COMMIT and
   XLOG_XACT_DISTRIBUTED_FORGET defines in the same locations.

4. Commit 0bead9a added the declaration of the new
   IsSubTransactionAssignmentPending and MarkSubTransactionAssigned
   functions in src/include/access/xact.h. Earlier commit 24e2740 had
   already added the definition of the RecordDistributedForgetCommitted
   function in the same location.

5. Commit d28ab91 removed the bool forceSync argument from the
   XactLogCommitRecord function definition in src/include/access/xact.h,
   while commit 19cd1cf had already added two arguments, int ndeldbs and
   DbDirNode *deldbs, to the same function definition.

6. Commit d28ab91 removed the false argument from the
   RecordTransactionCommitPrepared function in
   src/backend/access/transam/twophase.c when calling XactLogCommitRecord,
   while commit 19cd1cf had already added two arguments, ndeldbs and
   deldbs, to the same location.

7. Commit d28ab91 in src/backend/access/transam/xact.c removed the
   forceSyncCommit argument in the RecordTransactionCommit function when
   calling the XactLogCommitRecord function, while the earlier commit
   19cd1cf had already added two arguments, ndeldbs and deldbs, to the
   same location.

8. Commit d28ab91 in src/backend/access/transam/xact.c removed the bool
   forceSync argument in the XactLogCommitRecord function, while the
   earlier commit 19cd1cf had already added two arguments, int ndeldbs and
   DbDirNode *deldbs, to the same location.