STORM-105 : Some changes related to refactoring work for openvpn-storm