Use next instead of if at end of iteration

There is a new cop coming called `Next` that will look for this case.

Change-Id: I35ac6acd33065aa4a0b7b7ce6caea711a80b6670
Reviewed-on: http://gerrit.causes.com/37614
Tested-by: jenkins <jenkins@causes.com>
Reviewed-by: Shane da Silva <shane@causes.com>