KAZOO-797: update include and hrls to resolve issues with the new lager as well as normalize order