MGM: specifying profile folders so we do not wipe out custom profile module info.
MGM: adding patches for D7.21