Deprecate `runas` usage on `salt.states.postgres_database`. Refs #6961.
Deprecate `runas` usage on `salt.states.npm`. Refs #6961.
Deprecate `runas` usage on `salt.states.hg`. Refs #6961.
Deprecate `runas` usage on `salt.states.git`. Refs #6961.
Deprecate `runas` usage on `salt.states.gem`. Refs #6961.
Deprecation stops at salt 0.18.0
Merge remote-tracking branch 'upstream/develop' into develop
Merge pull request #7382 from whiteinge/file-replace-tests

Added unit and integration tests for the file.replace functions
Added ignore symlink option. Cleaned up roots.
Add connection kwargs to keystone module and state.

Add connection_{{arg}} to keystone's modules to function
similiarly to the mysql state and module.
Fix data type in initial creation of jids table
Merge pull request #7378 from s0undt3ch/hotfix/6961-deprecate-state-runas

Deprecate runas in state modules
Merge pull request #7383 from terminalmage/release_notes

Add paragraph on Mac OS User/Group support to 0.17.0 release notes
Merge pull request #7384 from evinrude/develop

Make symlinks optional for the roots fileserver
Merge pull request #7385 from jahkeup/keystone-connectionargs

Add connection kwargs to keystone module and state.
Set opts after identity for ssh-copy-id
Older ssh-copy-id commands can't pass through ssh options
forgot the quotes....
Fix cross-calling provider overrides

Provider overrides were being applied after __salt__ was added to each
minion module, causing minion overrides to be available on the CLI but
not within __salt__. This commit moves the processing of provider
overrides to within gen_functions, so that they happen before __salt__
is created and thus contain the module overrides.
Fix anomalous backslash.