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 remote-tracking branch 'upstream/2014.7' into sam_2014.7