Removed orphan elements from graphics.
Update graphic tests to eliminate orphans.
Graphics build files.
Merge branch 'issue1123' into dev-3.x