Issue 1495 - Introduce $sitescriptsini_content in Puppet sitescripts module
Merge remote-tracking branch 'upstream/master'