Merge pull request #3515 from nrwahl2/nrwahl2-compat_drops2
COMPAT fixes: on_node, crm_resource, year 2038