Roll riak_core dependency to 1.4.2
Merge branch '1.4' into develop

Conflicts:
	rebar.config
Update rebar to 2.1.0-166 to pick up update-deps fix