Fix configuration issues

Change-Id: Icaa7d6a5a037f159e9896c34cb9c49be00d551d4
Merge topic 'fix_python_module_rules' into next

2e73b07 Fix configuration issues