Replace public key for jamesofur

Patch2: readd old key with ensure absent
Patch3: Ugly whitespace warning

Change-Id: I9cdcdde0c4de3eaace065fb75e6944db04de0d11