Merge "[CORD-2301] updating ONF pod configs"