Added even more conf options. All havana coverage in place

Change-Id: I779b1ce39da66e210d550b7ff691843c541fee8b