Riak and SSLkeys Unit Test failures in Master

The riak_adapter and ssl_keys unit tests are currently failing in master. They need to be addressed. Output is below:

Test Summary Report
-------------------
t/api/1.1/deliveryservice/ssl_keys.t (Wstat: 1024 Tests: 121 Failed: 4)
Failed tests: 83-84, 87-88
Non-zero exit status: 4
t/api/1.1/riak_adapter.t (Wstat: 65280 Tests: 8 Failed: 0)
Non-zero exit status: 255
Parse errors: No plan found in TAP output
Files=66, Tests=2818, 217 wallclock secs ( 0.58 usr 0.19 sys + 160.38 cusr 34.12 csys = 195.27 CPU)
Result: FAIL