Merge "Fix for bug 28 https://bugs.opendaylight.org/show_bug.cgi?id=28 Updated surefi...