blockreplace: append_if_not_empty ensure \n before mark
Added HP Cloud documentation
Merge branch 'develop' of https://github.com/saltstack/salt into develop
Fix broken shell script.
file.blockreplace(append_if_not_empty): test for missing \n at EOF
Clarify where the Salt SSH configuration comes from.
cron: fix tests
Avoid shadowing outer `client` name in salt.cloud.clouds.nova.destroy()

************* Module salt.cloud.clouds.nova
salt/cloud/clouds/nova.py:355: [W0621(redefined-outer-name), destroy] Redefining name 'client' from outer scope (line 111)
Merge pull request #11132 from hulu/clouds-nova

Avoid shadowing outer `client` name in salt.cloud.clouds.nova.destroy()
cloud/clouds/lxc.py: fix typo in comment
fix typo: salt.config.{minion_conf=>minion_config}

************* Module salt.cloud.clouds.lxc
salt/cloud/clouds/lxc.py:70: [E1101(no-member), _minion_opts] Module 'salt.config' has no 'minion_conf' member
Merge pull request #11124 from CaptTofu/develop

Added document for use of salt-cloud with HP Cloud 1.1
Merge pull request #11126 from cachedout/ssh_work

Ssh work
Merge pull request #11134 from cvrebert/patch-1

cloud/clouds/lxc.py: fix typo in comment
Merge pull request #11136 from cvrebert/patch-2

fix typo: salt.config.{minion_conf=>minion_config}
[Nova] fix image_meta_delete

I apparently can't type and had put in image_meta_data instead of the
correct function when moving to SaltNova.
[Nova] unify _ids in nova module
Merge pull request #11139 from gtmanfred/image_meta_data

Image meta data
Merge pull request #11127 from makinacorpus/cronfix2

cron: fix tests
[Nova] apply _id to SaltNova too