PM-787 first stab at merging profiles and properties documentation.
Merge remote-tracking branch 'origin/master'