Updated main code to SVN #20320.

Merged with Mythbuntu weekly build 20300.

Build packages with patch #20300-2