Adopt the code changes made by mdsal project and mentioned in the following weather item.
https://jira.opendaylight.org/browse/TSC-99