There are a couple of things that will need to be
reviewed closer to the release.

behatnotneeded

Change-Id: I23280328a19173494e02f80a0571e50f86be6438
Signed-off-by: Kristina D.C. Hoeppner <kristina@catalyst.net.nz>