Merge "Fixing resources path in OpenDaylight"