Merge "Add new columns for satellite entitlement status and satellite entitlement plmns" into main