Merge "Allow keystore to read and write keystore.crash_count system property." into sc-dev