Consolidate openstack-meeting channels

With some IRC meetings having moved to team channels, we have
a lot more room in the "common" meeting rooms. To the point
where #openstack-meeting-cp and #openstack-meeting-5 are taking
up valuable bot space (bots can only join so many channels) for
very little usage.

Furthermore, the benefit of using common channels is that the
team activity is publicized to meeting channel lurkers, and
neither #openstack-meeting-cp not #openstack-meeting-5 gathered
a faithful attendance.

This propose to consolidate meetings to the other meeting channels
(#openstack-meeting{,-alt,3,4}) by moving the only two meetings
that actually took advantage of those two meeting rooms.

Once this merges, we can start the work of removing those from the
meeting bot watch.

Change-Id: Iafcba92f908f4305492737ffea2771acf85a7fbc

meetings/neutron-upgrades-meeting.yaml

@@ -4,7 +4,7 @@ agenda_url: https://wiki.openstack.org/wiki/Meetings/Neutron-Upgrades-Subteam
 schedule:
   - time:       '1400'
     day:        Thursday
-    irc:        openstack-meeting-5
+    irc:        openstack-meeting-alt
     frequency:  weekly
     start_date: 20160111
 chair:  Lujin Luo (lujinluo), Ihar Hrachyshka (ihrachyshka)

meetings/openstack-helm-team-meeting.yaml

@@ -4,7 +4,7 @@ agenda_url: https://etherpad.openstack.org/p/openstack-helm-meeting-agenda
 schedule:
   - time:       '1500'
     day:        Tuesday
-    irc:        openstack-meeting-5
+    irc:        openstack-meeting-4
     frequency:  weekly
     start_date: 20160502
 chair: Matt McEuen (mattmceuen)

tools/count_slot_usage.py

@@ -34,11 +34,7 @@ MEETINGS_PATH = os.path.join(BASE_DIR, 'meetings')
 WEEKDAYS = list(calendar.day_name)
 WEEK_COUNTS = {'weekly': 2, 'biweekly-even': 1, 'biweekly-odd': 1, 'adhoc': 0}
 CHANNELS = ['openstack-meeting', 'openstack-meeting-alt',
-            'openstack-meeting-3', 'openstack-meeting-4',
-            'openstack-meeting-5']
-# For now don't include -cp meetings as that is restricted to temporary
-# cross-project related meetings.
-# CHANNELS.append('openstack-meeting-cp')
+            'openstack-meeting-3', 'openstack-meeting-4']
 
 
 def main():