b7e43c8 Drop patch 13, broken in the merged version

Authored and Committed by loveshack 6 years ago
    Drop patch 13, broken in the merged version
    Fix remaining arch restriction
    Fix configured container_dir