Merge "Bug fix for bug 328 https://bugs.opendaylight.org/show_bug.cgi?id=328#add_comment"