Merge branch 'broker' of ssh://naan.mimuw.edu.pl:29418/nebulostore into broker

Conflicts:
	scripts/run-local-test.sh

Change-Id: I88f820b6defe848d0638ff7603a6d098cf0633a7
Merge branch 'broker' of ssh://naan.mimuw.edu.pl:29418/nebulostore into broker

Conflicts:
	scripts/run-local-test.sh

Change-Id: I3ebbfccee97ac70428d341d103f7add9308180c5