Merge pull request #15769 from s0undt3ch/2014.7

Use `-oIdentityFile` instead of `-i`