KFSTP-1402 Squashed commit

Squashed commit of the following:

commit 3e31d4a91edfcfd74e9f028aec3c1082cdfab096
Author: bhutchinson <bryan.hutchinson@cornell.edu>
Date:   Fri Oct 31 16:01:44 2014 -0400

    KFSTP-1402 fix code so Funds Manager derived role is processed appropriately

commit 3f9e8074765a227ec2ce2dc6109836fc70bd644c
Author: bhutchinson <bryan.hutchinson@cornell.edu>
Date:   Fri Oct 31 15:41:32 2014 -0400

    KFSTP-1402 new edit CINV permission