Followup fixes to FWaaS API patch

Fixes: bug #1206620

This adds the minor fixes which were suggested be fixed
as a followup to the FWaaS API patch.

Change-Id: I8112dcb4f750bb367dcc6464cda7a826b7be811e
Merge "Followup fixes to FWaaS API patch"