Merge "BUG-6890: Edit to cfg file reflecting that statistics collection is turned...