Fixes U4-2791 Error creating node containing @ v6.1.4.

Adding unit test which covers both U4-2791 and U4-2607
Merge branch '6.2.0' of https://github.com/umbraco/Umbraco-CMS into 6.2.0