CLOUDSTACK-5946: Commit 2774b62d64989bddc1e4664ef7a93dff11c77657 changed keystore file along with coverity fixes. Use varible name for keystore filename to keep it in sync