Merge "Fix proxy and IP settings" into jb-mr2-dev