Merge changes from topic "PPRL.181205.001"

* changes:
  SF: Fix DisplayTransactionTest
  DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into master