Merge pull request #814 from bhariharan/unstable

tapp0 is now defunct
Fix for crash in test credential parser