* unify content frame (watermark) template objects * several improvements, use existing env var for watermark url * tighten up var parsing for contentframe template object