Patches for check_ntp - fix for out of order associations [sf#1729581] [#804]