[ref_impl_eiffel] [1545] Further refactoring in docking classes;

Revision: 1545
Author: thomas.beale
Log Message: