credentials fix
Merge branch 'master' of github.com:hazelcast/hazelcast into fix-client-credentials/3.x-master

Conflicts:
hazelcast-client/src/test/java/com/hazelcast/client/ClientIssueTest.java
Merge pull request #1755 from gurbuzali/fix-client-credentials/3.x-master

Fix client credentials/3.x master