[apw@canonical.com: forward ported to new cleaned up indep stack.]
Signed-off-by: Ben Collins <ben.c@servergy.com>
Signed-off-by: Andy Whitcroft <apw@canonical.com>