Update mako fingerprint

Change-Id: I995b631723aea28246c3c0b53334eb5fa0451fae
Signed-off-by: Gergely Szell (sethyx) <szell@hu.ibm.com>
hercules: update fingerprint

Change-Id: I902c42875567b79d357337a92169775be181cfb4
Signed-off-by: Jonathan Steadman <xxwhitehawk@gmail.com>
Merge remote-tracking branch 'upstream/jb-mr1' into jb-mr1