Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack) Conflicts: daemon/graphdriver/aufs/aufs_test.go fixed conflict caused by imports
Signed-off-by: Tibor Vass <teabee89@gmail.com> Conflicts: graph/load.go fixed conflict in imports