Multiple fixes on Scripts (due to namespace changes)
Merge github.com:o2platform/O2.Platform.Scripts