Layout Import : Fix checking how Layout should be loaded and small refactor fixes xibosignage/xibo#2649
Layout Import : Fix checking how Layout should be loaded and small refactor
fixes xibosignage/xibo#2649

(cherry picked from commit 0483415c7ea83e6a23dc37f47d8fdde15077826b)

dasgarner/xibo-cms,xibosignage/xibo-cms,dasgarner/xibo-cms,dasgarner/xibo-cms,dasgarner/xibo-cms,xibosignage/xibo-cms,xibosignage/xibo-cms,dasgarner/xibo-cms,dasgarner/xibo-cms,xibosignage/xibo-cms,xibosignage/xibo-cms,xibosignage/xibo-cms