(cherry picked from commit e07d0ddabf) Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com> Conflicts: plugins/network-elements/netscaler/src/com/cloud/network/resource/NetscalerResource.java (cherry picked from commit 5563a7314e) Conflicts: plugins/network-elements/netscaler/src/com/cloud/network/resource/NetscalerResource.java
e07d0ddabf
5563a7314e