Resolves bug-report http://openfoam.org/mantisbt/view.php?id=1899
and two-phase functionality separated from multiphase functionality