Merge branch 'cmdows_dev_lukas'

# Conflicts:
#	pyKADMOS/sample/graph.py
#	pyKADMOS/scripts/sellarProblemRCE/FPG_converged-MDA-J.xml
#	pyKADMOS/scripts/sellarProblemRCE/MDAO_IDF.xml
#	pyKADMOS/scripts/sellarProblemRCE/MDAO_MDF-GS.xml
#	pyKADMOS/scripts/sellarProblemRCE/MDAO_MDF-J.xml
#	pyKADMOS/scripts/sellarProblemRCE/MDAO_converged-DOE-GS.xml
#	pyKADMOS/scripts/sellarProblemRCE/MDAO_converged-DOE-J.xml
#	pyKADMOS/scripts/sellarProblemRCE/MDAO_converged-MDA-GS.xml
#	pyKADMOS/scripts/sellarProblemRCE/MDAO_converged-MDA-J.xml
#	pyKADMOS/scripts/sellarProblemRCE/MDAO_unconverged-DOE-GS.xml
#	pyKADMOS/scripts/sellarProblemRCE/MDAO_unconverged-DOE-J.xml
#	pyKADMOS/scripts/sellarProblemRCE/MDAO_unconverged-MDA-GS.xml
#	pyKADMOS/scripts/sellarProblemRCE/MDAO_unconverged-MDA-J.xml
#	pyKADMOS/scripts/sellarProblemRCE/RCG.xml


Former-commit-id: 16ebdb30a8237353a80b9fbde34f57c404a90310