Remove PT refrences to deprecated folder src/include

Signed-off-by: Allison Henderson <achender@linux.vnet.ibm.com>
Fix merge

Signed-off-by: Frank S. Filz <ffilzlnx@mindspring.com>
Merge remote-tracking branch 'ganltc/ibm_next_20' into merge_next

Signed-off-by: Jim Lieb <jlieb@panasas.com>