Resolve #3538217 "Node edit restructure"

Ankit Pathakrequested to merge
issue/acquia_optimize-3538217:3538217-node-edit-restructure into 1.x

Closes #3538217

Merge request reports