Contrib update of profile2 and entity modules
Also renamed all features titles to start with FSP. Story 41886227
Renamed features & their files; Removed project property from info files to prevent scanning for upgrades
Renamed feature files. Story 41886227
Regenerated permissions feature. Story 42570297
Merge remote-tracking branch 'origin/develop' into develop
Resolved conflict created by removal of fsp_menus feature