971617 - ensuring that find_by_cp_id returns a read/write object
Merge pull request #2446 from jlsherrill/cp_id

971617 - ensuring that find_by_cp_id returns a read/write object