Properly merge role conditionals in with pre-existing conditionals

Fixes #7387
Add missing basedir to Runner in _do_setup_step
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.
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
Merge branch 'ByteInternet-pass-basedir-to-runner-on-setup' into devel