Merge "Gerrit contains following fixes: 1) Fix for bug 284 - Added custom ip matching...