Fix line duplicated in merge
Merge pull request #14 from Metaswitch/fix_incorrect_merge

Fix line duplicated in merge
Merge branch 'dev' into 3p_reg_forward_registers
Brining into line with IfcHandler signature changes