Adding OrganizationMaster and OrganizationSource into ToolContextComponentFactory
Adding missing = in toString
Force PROJECT name