Merge pull request #2084 from stewart-ibm/bump-pfw

Bump PFW components (master and OP920)