More fixes to unique container names for lilypond when master is involved