Update conf file with icehouse release changes

Sync api-paste.ini with ssl support
Sync heat.conf with comment changes and additional sections.

Change-Id: Icff75c6737f37df8466cf2b9d591483d8f917509
Closes-Bug: 1300320
Merge "Update conf file with icehouse release changes"