AUI-1007 Test
Add instructions about overwriting options via command-line
Merge branch 'pr-315'