Merge the Q&A sessions into one for Day#2

The Q&A session require a special type of meeting with
the ability of the audience to participate and engage more
actively.

Having a single Q&A session at the end allows simplifying the
overall logistics.

Also extend Tony's talk about AWS-Gerrit and X-Ray to 30 mins
so that he can have more time to explain what it is and how
we also use it for E2E tests for Gerrit releases.

Change-Id: Ia38311da42a3b5a199d74d3667d256fff80571da
diff --git a/schedule.md b/schedule.md
index 16d11fc..90ae4ef 100644
--- a/schedule.md
+++ b/schedule.md
@@ -23,8 +23,6 @@
 |  8:00 PST / 17:00 CET | [How to survive with mono-repos in Gerrit](sessions/mono-repo-with-gerrit.md)           |
 |  8:30 PST / 17:30 CET | [Promoting Situational Awareness in Code Review Platforms](sessions/promoting-situational-awareness-in-code-review.md) |
 |  9:00 PST / 18:00 CET | [An introduction to the pull-replication plugin](sessions/pull-replication-plugin.md)                              |
-|  9:30 PST / 18:30 CET | Q&A with the maintainers (may include 1-2 polls)                                        |
-| 10:30 PST / 19:30 CET | [X-RAY for Gerrit in AWS](lightning-talks/xray-for-gerrit-in-aws.md)                    |
-| 10:40 PDT / 19:40 CET | Lightning talk 7 - __available for proposals__                                          |
-| 10:50 PDT / 19:50 CET | Final Q&A  (may include a final poll)                                                   |
+|  9:30 PST / 18:30 CET | [X-RAY for Gerrit in AWS](lightning-talks/xray-for-gerrit-in-aws.md)                    |
+| 10:00 PST / 19:00 CET | Q&A with the maintainers (may include 1-2 polls)                                        |
 | 11:00 PDT / 20:00 CET | End of Day 2                                                                            |