Fix bug 888479:
Only allow master branch merges to set bug status to FixCommitted.
For other branches (think stable/diablo or milestone-proposed), set
a in-BRANCHNAME tag instead, to allow for efficient searching.
Change-Id: I6401ab4ba92f7983040ac8b2008c88490e2589d8