Merge changes I86c37b6d,I976b29bf

* changes:
  Frameworks: Disable two recoverablekeystore tests
  Frameworks: Fix JUnit4 test annotations