Merge branch 'ls/p4-lfs' into HEAD

Recent update to Git LFS broke "git p4" by changing the output from
its "lfs pointer" subcommand.

* ls/p4-lfs:
git-p4: fix Git LFS pointer parsing
travis-ci: express Linux/OS X dependency versions more clearly
travis-ci: update Git-LFS and P4 to the latest version

diff --combined t/t9824-git-p4-git-lfs.sh
index 3fc6790b0744f40fab91be76768cdf71f9d71789,ca93ac8813c6bcf2a479492cffb13beaf452ebc1..110a7e792475fcf19ef782fae1d265ae81653853
--- 1/t/t9824-git-p4-git-lfs.sh
--- 2/t/t9824-git-p4-git-lfs.sh
+++ b/t/t9824-git-p4-git-lfs.sh
@@@ -13,6 -13,10 +13,10 @@@ test_file_in_lfs () 
        FILE="$1" &&
        SIZE="$2" &&
        EXPECTED_CONTENT="$3" &&
+       sed -n '1,1 p' "$FILE" | grep "^version " &&
+       sed -n '2,2 p' "$FILE" | grep "^oid " &&
+       sed -n '3,3 p' "$FILE" | grep "^size " &&
+       test_line_count = 3 "$FILE" &&
        cat "$FILE" | grep "size $SIZE" &&
        HASH=$(cat "$FILE" | grep "oid sha256:" | sed -e "s/oid sha256://g") &&
        LFS_FILE=".git/lfs/objects/$(echo "$HASH" | cut -c1-2)/$(echo "$HASH" | cut -c3-4)/$HASH" &&
@@@ -265,7 -269,7 +269,7 @@@ test_expect_success 'Add big files to r
                # We only import HEAD here ("@all" is missing!)
                git p4 clone --destination="$git" //depot &&
  
 -              test_file_in_lfs file6.bin 13 "content 6 bin 39 bytes XXXXXYYYYYZZZZZ"
 +              test_file_in_lfs file6.bin 39 "content 6 bin 39 bytes XXXXXYYYYYZZZZZ" &&
                test_file_count_in_dir ".git/lfs/objects" 1 &&
  
                cat >expect <<-\EOF &&