Merge branch 'master' into dev_distr_architectures_surr_models

# Conflicts:
#	examples/scripts/sellar_problem/(X)DSM/FPG_IDF.pdf
#	examples/scripts/sellar_problem/(X)DSM/FPG_MDF-GS.pdf
#	examples/scripts/sellar_problem/(X)DSM/FPG_MDF-J.pdf
#	examples/scripts/sellar_problem/(X)DSM/FPG_converged-DOE-GS.pdf
#	examples/scripts/sellar_problem/(X)DSM/FPG_converged-DOE-J.pdf
#	examples/scripts/sellar_problem/(X)DSM/FPG_converged-MDA-GS.pdf
#	examples/scripts/sellar_problem/(X)DSM/FPG_converged-MDA-J.pdf
#	examples/scripts/sellar_problem/(X)DSM/FPG_unconverged-DOE-GS.pdf
#	examples/scripts/sellar_problem/(X)DSM/FPG_unconverged-DOE-J.pdf
#	examples/scripts/sellar_problem/(X)DSM/FPG_unconverged-MDA-GS.pdf
#	examples/scripts/sellar_problem/(X)DSM/FPG_unconverged-MDA-J.pdf
#	examples/scripts/sellar_problem/(X)DSM/FPG_unconverged-OPT-GS.pdf
#	examples/scripts/sellar_problem/(X)DSM/FPG_unconverged-OPT-J.pdf
#	examples/scripts/sellar_problem/(X)DSM/MDAO_IDF.pdf
#	examples/scripts/sellar_problem/(X)DSM/MDAO_MDF-GS.pdf
#	examples/scripts/sellar_problem/(X)DSM/MDAO_MDF-J.pdf
#	examples/scripts/sellar_problem/(X)DSM/MDAO_converged-DOE-GS.pdf
#	examples/scripts/sellar_problem/(X)DSM/MDAO_converged-DOE-J.pdf
#	examples/scripts/sellar_problem/(X)DSM/MDAO_converged-MDA-GS.pdf
#	examples/scripts/sellar_problem/(X)DSM/MDAO_converged-MDA-J.pdf
#	examples/scripts/sellar_problem/(X)DSM/MDAO_unconverged-DOE-GS.pdf
#	examples/scripts/sellar_problem/(X)DSM/MDAO_unconverged-DOE-J.pdf
#	examples/scripts/sellar_problem/(X)DSM/MDAO_unconverged-MDA-GS.pdf
#	examples/scripts/sellar_problem/(X)DSM/MDAO_unconverged-MDA-J.pdf
#	examples/scripts/sellar_problem/(X)DSM/Mdao_unconverged-OPT-GS.pdf
#	examples/scripts/sellar_problem/(X)DSM/Mdao_unconverged-OPT-J.pdf
#	examples/scripts/sellar_problem/(X)DSM/RCG.pdf
#	examples/scripts/sellar_problem/CMDOWS/FPG_IDF.xml
#	examples/scripts/sellar_problem/CMDOWS/FPG_MDF-GS.xml
#	examples/scripts/sellar_problem/CMDOWS/FPG_MDF-J.xml
#	examples/scripts/sellar_problem/CMDOWS/FPG_converged-DOE-GS.xml
#	examples/scripts/sellar_problem/CMDOWS/FPG_converged-DOE-J.xml
#	examples/scripts/sellar_problem/CMDOWS/FPG_converged-MDA-GS.xml
#	examples/scripts/sellar_problem/CMDOWS/FPG_converged-MDA-J.xml
#	examples/scripts/sellar_problem/CMDOWS/FPG_unconverged-DOE-GS.xml
#	examples/scripts/sellar_problem/CMDOWS/FPG_unconverged-DOE-J.xml
#	examples/scripts/sellar_problem/CMDOWS/FPG_unconverged-MDA-GS.xml
#	examples/scripts/sellar_problem/CMDOWS/FPG_unconverged-MDA-J.xml
#	examples/scripts/sellar_problem/CMDOWS/FPG_unconverged-OPT-GS.xml
#	examples/scripts/sellar_problem/CMDOWS/FPG_unconverged-OPT-J.xml
#	examples/scripts/sellar_problem/CMDOWS/Mdao_IDF.xml
#	examples/scripts/sellar_problem/CMDOWS/Mdao_MDF-GS.xml
#	examples/scripts/sellar_problem/CMDOWS/Mdao_MDF-J.xml
#	examples/scripts/sellar_problem/CMDOWS/Mdao_converged-DOE-GS.xml
#	examples/scripts/sellar_problem/CMDOWS/Mdao_converged-DOE-J.xml
#	examples/scripts/sellar_problem/CMDOWS/Mdao_converged-MDA-GS.xml
#	examples/scripts/sellar_problem/CMDOWS/Mdao_converged-MDA-J.xml
#	examples/scripts/sellar_problem/CMDOWS/Mdao_unconverged-DOE-GS.xml
#	examples/scripts/sellar_problem/CMDOWS/Mdao_unconverged-DOE-J.xml
#	examples/scripts/sellar_problem/CMDOWS/Mdao_unconverged-MDA-GS.xml
#	examples/scripts/sellar_problem/CMDOWS/Mdao_unconverged-MDA-J.xml
#	examples/scripts/sellar_problem/CMDOWS/Mdao_unconverged-OPT-GS.xml
#	examples/scripts/sellar_problem/CMDOWS/Mdao_unconverged-OPT-J.xml
#	examples/scripts/sellar_problem/CMDOWS/RCG.xml
#	examples/scripts/sellar_problem/KDMS/FPG_unconverged-DOE-J.kdms
#	examples/scripts/sellar_problem/KDMS/Mdao_converged-MDA-GS.kdms
#	examples/scripts/ssbj/(X)DSM/RCG.pdf
#	examples/scripts/ssbj/CMDOWS/RCG.xml
#	examples/scripts/ssbj/VISTOMS/VISTOMS.html


Former-commit-id: d55647d06a276e2407f7010ff405c394f65806bf