Update to latest stable bootstrap script v2014.09.25

* Properly detect Amazon AMI's >= 2014.9. saltstack/salt-bootstrap#468
Skip ssh grains test for now. Test environment isn't set up to handle it.
Actually, just fix pylint
Merge pull request #16143 from s0undt3ch/hotfix/bootstrap-script

Update to latest stable bootstrap script v2014.09.25
Merge pull request #16151 from rallytime/fix_ssh_test

Fix jenkins - Skip ssh grains test for now.
Merge branch '2014.7' into develop