Chrerry-picked IMC changes in master.

Conflicts:
	programs/tests/test_IMC.cpp
	src/DUNE/IMC/Constants.hpp