There are some redundant TALON fixes in this particular commit, hopefully it handles ok on Jenkins. Tested with Talon SRX Unit Test (firm 0.34) Change-Id: I67db546fea2867cc6bd53ea26dc1cb61ac106490