Merge "Remove references to Keymaster::3.0 from Keymaster::4.0"