Merge branch 'ls/travis-update-p4-and-lfs'