Only print invalid layer message is layer is actually invalid.
Fixed bug in options dialog due to incorrect bracket order
Fix for invalid operand types in string concatenation in jenkins with aggregator.py
Test fix for html renderer
fix jenkins pep8 and part of pylint

Signed-off-by: Werner Macho <werner.macho@gmail.com>
Merge remote-tracking branch 'origin' into inasafe-683