Corrected IPs in Farms forms, added tags to test for Service Definition Tab

Change-Id: I24f22a530e9ae73e36f89ec28c9e6bd484f53778