Finish implementation of SteklovPoincareStep with contact problems.  I don't dare to test this today...

[[Imported from SVN: r6871]]