Carry forward honolulu fixes Signed-off-by: Dan Timoney <dtimoney@att.com> Signed-off-by: Dan Timoney <dtimoney@att.com> Signed-off-by: Dan Timoney <dtimoney@att.com> Signed-off-by: Dan Timoney <dtimoney@att.com> Signed-off-by: Dan Timoney <dtimoney@att.com>