Updated quantum.conf parameters

bug: #1122221

Change-Id: Idc1ec627dea730d117ab5f5e3703c08ba658d708
author: Diane Fleming
Merge "Updated quantum.conf parameters"