Merge the latest changes in v1.0.x into develop

Fixed var used in calculation of port-threshold in iptrunk role.

assigned to @Aleksandr.Kurbatov

merged

mentioned in commit 59c2fe74