push plfs error type changes to master

Change-Id: I23b974335a0e4a82be0bdcf47a994349f82e3555