The b-quark mass from non-perturbative $N_f=2$ Heavy Quark Effective Theory at $O(1/m_h)$