Merge branch 'COOK-2484' into needle

* COOK-2484:
  COOK-2484: use owner and group from application properties