backport FWaaS for Mitaka

Change-Id: I94eba5953a7e0c6ce58a2c79fabcedfc695a9d72
3 files changed