Merge changes from topic "flicker-junit"

* changes:
  Common flicker assertions
  Improve JUnit4 compatibility on Flicker