remove unused config options

There are several historical cut/paste unused options, which have
also now found there way into heat.conf.sample, which will confuse
users, so best to remove them.

Fixes bug #1215834

Change-Id: I0fe4717327fc67fe109bef4ba1758d2f18e84520
Merge "remove unused config options"