Merge "libqservice: Correct enum declarations w.r.t. dyn_pu node value"