Build/packaging fixes for 2013.1.2.0

Le sigh...

Fixes Jira: OPENSTACK-557

Change-Id: I0eef9ae4eb768bd9bda001065cb1bcf22cd660c8