fix bad conflict resolution, include uiauto bootstrap when launching instruments
Merge pull request #1995 from jlipps/master

fix bad conflict resolution, include uiauto bootstrap when launching ins...