Merge pull request #79 from amcgowanca/7.x-1.x-dev

Critical: Inheritable profiles patch update with dependency check enforcement
Added patch for fixing file field property overwrite.