resolved merge conflicts...Merge remote-tracking branch 'IBMQuantum/Dev' into Dev
resolved merge conflicts...Merge remote-tracking branch 'IBMQuantum/Dev' into Dev

QISKit/qiskit-sdk-py,atilag/qiskit-sdk-py,ChristopheVuillot/qiskit-sdk-py,ChristopheVuillot/qiskit-sdk-py,atilag/qiskit-sdk-py,ChristopheVuillot/qiskit-sdk-py,QISKit/qiskit-sdk-py,QISKit/qiskit-sdk-py,atilag/qiskit-sdk-py