Revert "Makefile adjustments"

This reverts commit 7171e0dde3756c66002ebb2eb9532334033917d2.
Revert "Merge nfs containerization work from Trond's tree"

This reverts commit 135872228044c24529087325825f1f7082a99ef0.
Revert "Linaro GCC 4.7 -o3 fixes"

This reverts commit 3ef2d4652183e11d557c42ce7ca08b4222d0774f.
Revert "Linaro GCC 4.9.1: fix compilation errors"

This reverts commit ba4cdf557ea577330db5e5b1fd82bc9ab734c5e8.