Handle ValueError during json.loads of json data from build
Merge pull request #7373 from sivel/issue/7367

Handle ValueError during json.loads of json data from build
Allow wait_for to wait on non-traditional files

Use os.path.exists to check for file existence, instead of "can we open
this file for reading".

Fixes #6710
Update ssh.py

Convert to string to fix runtime error due to string concat in self.common_args += ["-o", "User="+self.user] when ansible_ssh_user is numeric
Fixed incorrect handling of paths contaiin whitespaces
Fix missing variable initialization so an unspecified internal_network runs
Merge branch 'marcore-devel' into devel
Merge pull request #7380 from carsongee/cg/quantum_ip_subnet

Fix missing variable initialization so an unspecified internal_network works
Merge pull request #7382 from jimi-c/issue_7366_synchronize_inventory_dir

Do not base synchronize source on the inventory directory
Use utils.combine_vars on vars_files data

Fixes #7345
Fail fast in the presence of permissions issues
Correctly cast the size_gb value for vpshere disks

Fixes #7385
Properly merge role conditionals in with pre-existing conditionals

Fixes #7387
Add missing basedir to Runner in _do_setup_step
Pass vars_files on to included playbooks too

Fixes #7384
Clarify that the encrypted param must also be set.

While the encrypted parameter's documentation clearly states that it needs to
be set, if you are focused on the password parameter's documentation, there's
nothing to draw your attention to the fact that encrypted may also need to be
set.
Fix env splitting in docker module

ENV variable value could contain '=' (for example mysql://host/db?pool=10)
Merge pull request #7393 from jimi-c/issue_7387_role_conditionals

Properly merge role conditionals in with pre-existing conditionals
Merge pull request #7399 from SirScott/postgresql_user_doc_touchup

postgresql_user module documentation:  Clarify that the encrypted param must also be set.
Merge branch 'pass-basedir-to-runner-on-setup' of https://github.com/ByteInternet/ansible into ByteInternet-pass-basedir-to-runner-on-setup