Merge branch 'paramsessionkey' into upstream-4.0-stable
b: return error on chown and chgrp
Merge branch 'paramsessionkey' into upstream-master