Fix to make sure mediaserver properties are set to
the correct value.

    BUG=XWALK-2015
Merge pull request #337 from brianjjones/master

Fix to make sure mediaserver properties are set