fix 43: double definition & illegal start of operation in keystore

Change-Id: I1e4362bef00f50aec7ca71887abf41612aa5d534