blockreplace: append_if_not_empty ensure \n before mark
Started some integration tests for mac_user module
file.blockreplace(append_if_not_empty): test for missing \n at EOF
cron: fix tests
Removed references to internal region terminology
Merge pull request #11127 from makinacorpus/cronfix2

cron: fix tests
[Nova] apply _id to SaltNova too
Merge pull request #11140 from gtmanfred/image_meta_data

[Nova] apply _id to SaltNova too
Merge pull request #11141 from CaptTofu/develop

Removed internal nomenclature for regions
[Nova] I cant type, flavor, not flvaor
Merge pull request #11142 from gtmanfred/image_meta_data

[Nova] I cant type, flavor, not flvaor
Prevent endless recursion from external pillars
Merge branch 'develop' of github.com:CaptTofu/salt into develop

Conflicts:
	doc/topics/cloud/hpcloud.rst
Merge branch 'develop' of https://github.com/saltstack/salt into develop
Use --plugins to include plugin-provided repos

This adds --plugins to several repoquery calls, allowing results from
plugin-provided repositories to be returned.
Merge pull request #11137 from ze42/dev_blockreplace

blockreplace - ensure newline before appending
Merge pull request #11144 from techhat/pillar

Prevent endless recursion from external pillars
file.blockreplace: fix typo endswith
Wrote a mac_user integration test
Merge pull request #11146 from ze42/dev_blockreplace

file.blockreplace: fix typo endswith