New metallus branch config [ci skip]
bumped version for trusty build
fixed metallus config conflicts
fixed merge conflicts
Merge branch 'master' into production