BZ-10015 fixed overriding facilityID