Merge from master and fix conflicts

Signed-off-by: Thane Thomson <connect@thanethomson.com>

test/e2e/app/app.go

@@ -184,7 +184,7 @@ func (app *Application) FinalizeBlock(req abci.RequestFinalizeBlock) abci.Respon
 		txs[i] = &abci.ExecTxResult{Code: code.CodeTypeOK}
 	}
 
-	valUpdates, err := app.validatorUpdates(uint64(req.Header.Height))
+	valUpdates, err := app.validatorUpdates(uint64(req.Height))
 	if err != nil {
 		panic(err)
 	}
@@ -202,7 +202,7 @@ func (app *Application) FinalizeBlock(req abci.RequestFinalizeBlock) abci.Respon
 					},
 					{
 						Key:   "height",
-						Value: strconv.Itoa(int(req.Header.Height)),
+						Value: strconv.Itoa(int(req.Height)),
 					},
 				},
 			},