Merge "Make init builtin command installkey respect property updates" into oc-dev