Merge changes I368eb407,Ia5c5c54a

* changes:
  UPSTREAM: xtables-compat: fix snprintf truncation warnings
  UPSTREAM: libxt_comment: silence truncation warning