Be more 'correct' with padding

Change-Id: Ib47f1a352575649aec326ac6844891f044cee6b7
Reviewed-on: http://review.couchbase.org/28192
Tested-by: Mark Nunberg <mnunberg@haskalah.org>
Reviewed-by: Sergey Avseyev <sergey.avseyev@gmail.com>