author: hanya (cherry picked from commit e945b49105bab50700274f797e41d1446a70641d) Conflicts: scripting/source/pyprov/pythonscript.py Change-Id: Ia019a737c5f80d3af9fc50aefcda6f5b00987513
author: hanya (cherry picked from commit e945b49105bab50700274f797e41d1446a70641d) Conflicts: scripting/source/pyprov/pythonscript.py Change-Id: Ia019a737c5f80d3af9fc50aefcda6f5b00987513