Removed bit about updating cluster servers
Reverted modern deploy config
Merge commit '82665d270402227069574c4f5c36b124f3923634' into develop
Whitespace cleanup
Respect rule-configuration when exporting related items
Merge commit '298f8aa3c1e558a0abcf88236265746aa567b34a' into develop