Synchronize servicelib with master repo; also fixes user defined controls in harness