Generate more alarms in the alarm queue overflow test, to avoid spurious failures if some alarms get processed
Put gmock/gmock.h in the include path for fakezmq
Merge pull request #881 from rkday/fix_alarm_test

Fix minor issues with alarms test code