Support building within git repository

The lib directory for python modules conflicted with the symlinks for a
merged usr so this moves the directory out of the way

steps/improve/merged_usr.sh

@@ -6,5 +6,9 @@
 # Add the rest of the FHS that we will use and is not created pre-boot
 ln -s bin /usr/sbin
 for d in bin lib sbin; do
+    if [ -d "/${d}" ] && ! [ -L "/${d}" ]; then
+        # Move the non symlink directory out of the way
+        mv "/${d}" "/${d}-saved"
+    fi
     ln -s "usr/${d}" "/${d}" || true # these might exist if rerunning
 done