Merge pull request #2137 from fstagni/bunchFixev6r12-7

[v6r12] Moved Script module to correct location
Merge branch 'rel-v6r12' into integration