bug 905096 - Build script modularization