Update TravisCI config so it will work when testing non-master branches

Change-Id: I90f2d92dd607f21470b4314c57bf376df35b125b
Merge "Update TravisCI config so it will work when testing non-master branches"