Fix the test for contribution tags during Thank You generation

Change-Id: If27e0245af99e76f90f7d04bb4b1a887ccfd767c
Edits to the wr1 parser so it can handle the oid refactor

Change-Id: Ie1d532853e3b037fe19628d870e4d43eb038ad95
Fix the restarted recurring conditional

Change-Id: I5d68400d8fff073f5f9aaadf3bdb99e94b397c2d
Merge "Fix the restarted recurring conditional"
Merge "Fix the test for contribution tags during Thank You generation"
Merge remote-tracking branch 'origin/master' into HEAD