Fixed issue removing system watermark - refs #6587
Merge branch '1.9.x' of github.com:chamilo/chamilo-lms into 1.9.x