JMP-1: Updated credentials to support serverId in maven settings file, currently only seems to work with unencrypted passwords