Replace deprecated conf option for heat

Change-Id: I0419b188ecc2bd946c1c1f565875c6a04f4afd9b
Closes-Bug: #1379234
Merge "Replace deprecated conf option for heat"