git-p4: keyword flattening fixes