VP-291: Making components configurable by changing their demands blocks ...

...in the VideoPlayer. Fixing options to eliminate infinite loops after options merging.
http://issues.fluidproject.org/browse/VP-291