An Assessment of the Non-Discrimination Principle in the Context of Sexual Orientation and Gender Identity: Shifting the Gears in International Law-Making