Bring WeeklyReport extension code closer to upstream

When it comes to coding style and other smaller changes that have
taken place in the meantime. Also update the string comparison for
"Merged in Gerrit" Bugzilla comments though I expect it to still
not work at all.

Change-Id: I793541e1187187c9bb30aa7a8de410cc534038f9