Merge "Bug 539628 - [IoTML] Improve layout of diagrams in IoT profile"