/distribution/beaker/setup: allow merging with base ref, instead of just checking out

Also added some strategic rlDie calls, to make the task fail faster if
something goes bad.

Change-Id: Ia1bc6521d20bfc63e3187bc537a785cb852e26d4
Merge "/distribution/beaker/setup: allow merging with base ref, instead of just checking out" into develop
--version option for bkr client

Bug: 862146
Change-Id: I01b0b8679c31f2e3adb2e73592b1fdaa2038843a
Merge branch 'release-0.13' into develop
Display correct error message when no task added

Bug: 972407
Change-Id: Id8c56f18a7d592dc0c7ca8e48605e3302239542e
show a message when the user doesn't have permission to edit power

Also fixed up the wording of some similar messages to be more
consistent.

Bug: 953749
Change-Id: I51e6835b66a1efe0192c7e3e018a6f4430e66e12
Add a pylint config file

Change-Id: Ic78c5b98abf8460d63f639d6d7a8d56ed7061f5d
Create tmpfiles.d files for beaker server and LC.

Also enable conditional build on F18+.

Change-Id: I8707efcfba425fcaa69f11a0b8aff7aa3b062f7c
Update Apache config for 2.4.
(while keeping 2.2 compatibility)

Change-Id: I8379117cf3ac127f3a02a3cc21916fc28ec6df42
Merge "Create tmpfiles.d files for beaker server and LC." into develop
Merge branch 'release-0.13' into develop
Fix watchdog.py to login before daemonizing
Merge "--version option for bkr client" into develop
Close connections to hub before daemonizing.

This is to handle keep-alive for XML-RPC connections
in lab controller daemons in Fedora (18+)/Python 2.7.

Bug: 977269
Change-Id: Ic5aa21386b2c3f986d2602a27ed32614bbce0d3b
Merge "Fix watchdog.py to login before daemonizing" into develop
Fix for editing OS version alias.

Bug: 975644
Change-Id: I21724b80d43fe91f2b265cac93a380fbcfb44772
Merge "Close connections to hub before daemonizing." into develop
Merge "show a message when the user doesn't have permission to edit power" into develop
Merge "Fix for editing OS version alias." into develop
Merge branch 'release-0.13' into develop