Fix circular python issues, same fix in Keystone and Barbican Change-Id: I77e60ed42ab43e3f5984b8a52dc5898325df1c8e