Update to latest stable bootstrap script v2014.09.25

* Properly detect Amazon AMI's >= 2014.9. saltstack/salt-bootstrap#468
Merge pull request #16142 from s0undt3ch/hotfix/bootstrap-script-2014.1

Update to latest stable bootstrap script v2014.09.25
Return pillar data if not external pillar data

Pillar data should be returned if there is no external pillar data, in
the same manner pillar and external-pillar datas are merged.
Ensure that mount.mounted modifies entries in fstab on changes

mount.mounted compared entries in fstab only by their fs_spec to determine if an
entry that is about to be added was already present and that the original one
should therefore be modified. It is, however, necessary to compare both fs_spec
and fs_file fields to allow users to mount new filesystems or block devices to
the same mountpoint.

This fixes #15968 which had already been fixed in #9573 but was re-introduced in
c8c6112 due to, what I believe, not rebasing that PR against develop.
Merge pull request #16229 from rallytime/cp-16035

Cherry-pick #16035 to 2014.1
Log 'zfs help' output at loglevel trace

This change was made in the past on 2014.7 and develop but never in
2014.1. Adding it here in the event that we end up releasing a
2014.1.12.
Merge pull request #16261 from terminalmage/log-zfs-trace-2014.1

Log 'zfs help' output at loglevel trace
Merge pull request #16212 from semarie/2014.1

Return pillar data if not external pillar data