UPdated SaltKeep loadRemoteData was missing
added dump parameter so keep.status
removed estate id (eid, device_id) from RaetKey keydata in file
Fix pillar overlay bug
Merge pull request #14445 from cachedout/12098

Fix pillar overlay bug
Merge remote-tracking branch 'upstream/2014.7' into sam_2014.7
Merge pull request #14446 from SmithSamuelM/sam_2014.7

Updated SaltKeep Removed eid from RaetKey files since not one to one anymore
Add context to augeas.execute CLI example
Merge pull request #14457 from rallytime/augeas_cli_example

Add context to augeas.execute CLI example
Check if api_key is set in kwargs instead of checking for key
Merge pull request #14461 from seacrib/nova_password_fix

Check if api_key is set in kwargs instead of checking for key
Merge branch '2014.7' into develop