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.
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
Add warning for FC19 users.
Merge pull request #16357 from cro/fc_systemd_warning

Add warning for FC19 users
updated masterless documentation to clarify the need to disable (or not run) the salt-minion daemon, otherwise the minion will attempt to connect to a master

Conflicts:
	doc/topics/tutorials/quickstart.rst
Merge pull request #16395 from juiceinc/2014.1

Cherry-pick masterless doc clarifications for 2014.1