Only ignore build in top level
Add some stuff to make building rpms easier

Conflicts:
	pkg/rpm/salt.spec
Make buildid a argument
Log warning if the grains file cannot be parsed. Refs #8690.
add function file.grep
Changing aws to ec2 in docs
Merge branch 'develop' of https://github.com/saltstack/salt into awsfix
Adding Getting Started guide for Linode
Remove doc reference to minion
Have runner return event have "return" to be the same as other events
return a dict like other data return events
Add alpha warning for salt-ssh
Merge pull request #8758 from basepi/saltsshwarning

Add alpha warning for salt-ssh
Merge pull request #8755 from pass-by-value/more_doc_changes

Remove doc reference to minion
Changed YAML example to two-space indents
Fixed incorrect map example; grains must be at same level as minion
Merge pull request #8762 from whiteinge/cloud-map-docs

Cloud map docs fixes
Updated the tls module with an additional example showing data beign passed from the CLI.
Don't depend on the pecl return code because it's broken.

Refs #8750.
Pass unix_socket option through to the execution module.

Refs #8702.