Merge branch 'service-contact' into dev

2 jobs for v2.2.0 in 31 seconds (queued for 1 minute and 11 seconds)
latest
Status Name Job ID Coverage
  Lint
failed lint #189549

00:00:31

 
  Build
skipped build #189550
 
Name Stage Failure
failed
lint Lint
go: finding golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e
go: finding golang.org/x/sys latest
go: downloading golang.org/x/tools v0.0.0-20200124021010-5c352bb417e0
go: extracting golang.org/x/tools v0.0.0-20200124021010-5c352bb417e0
/builds/feudal/feudalClient/main.go:156:11: if block ends with a return statement, so drop this else and outdent its block
/builds/feudal/feudalClient/main.go:180:11: if block ends with a return statement, so drop this else and outdent its block
Found 2 lint suggestions; failing.
make: *** [Makefile:15: lint] Error 1
ERROR: Job failed: exit code 2