FLUID-5205, FLUID-5216: Adding instructional demos for the prefs framework conditional adjusters functionality.
FLUID-5205, FLUID-5216: Code clean-up, improved comments, updates to reflect fix to FLUID-5190.
Merge branch 'master' into FLUID-5205
Merge remote-tracking branch 'justin/FLUID-5205' into FLUID-5205