Merge "Remove opendaylight service mask" into stable/fraser