Merge branch 'danielsilverstone-ct/reenable-key-in-node' into 'master'

Re-enable `key in somenode` construct after YAML new world order

See merge request !1280