branch update

branch update
Merge branch 'release-0.5' of https://github.com/skysql/MaxScale into release-0.5
Update from 'release-0.5'