[BUGFIX] Fix merging of "includeProperties" option

The "includeProperties" option of an alias/collection now
overrides the base "includeProperties" option if set.