bug 823090 - reduce number of marionette errors in tbpl. r=jgriffin