Fix string prefix check
Allow custom grains to overwrite core grains
Update event.fire_master_env docstring with sudo instructions
Merge pull request #14901 from Nibbler999/fix-custom-grains-override

Fix custom grains override
Merge pull request #14930 from whiteinge/doc-event-fire_master_env-sudo

Update event.fire_master_env docstring with sudo instructions
Add template files to manifest so they get included

in python 2.6 builds because package_data was changed in 2.7
Merge pull request #14969 from thatch45/2014.7

Add template files to manifest so they get included
Merge branch '2014.7' into develop