Merge branch 'fix-build-script' into '2.6.1-dev'

Removed python script for Gerrit, fixed return code of build script

See merge request !8